ssl: Do not use undocumented crypto function

Clean up white space errors

Author: IngelaAndin

lib/ssl/src/dtls_record.erl

@@ -623,6 +623,5 @@ start_additional_data(Type, Version, Epoch, SeqNo) ->
 
 
 sufficient_dtlsv1_2_crypto_support() ->
-    CryptoSupport = crypto:supports(),
-    proplists:get_bool(sha256, proplists:get_value(hashs, CryptoSupport)).
+    proplists:get_bool(sha256, crypto:supports(hashs)).
 

lib/ssl/src/ssl_cipher.erl

@@ -43,10 +43,12 @@
 
 -type oid()               :: tuple().
 -type public_key_params() :: #'Dss-Parms'{} |  {namedCurve, oid()} | #'ECParameters'{} | term().
--type public_key_info()   :: {oid(), #'RSAPublicKey'{} | integer() | #'ECPoint'{}, public_key_params()}.
+-type public_key_info()   :: {oid(), #'RSAPublicKey'{} | integer() |
+                              #'ECPoint'{}, public_key_params()}.
 -type ssl_handshake_history() :: {iodata(), iodata()}.
 
--type ssl_handshake() :: #server_hello{} | #server_hello_done{} | #certificate{} | #certificate_request{} |
+-type ssl_handshake() :: #server_hello{} | #server_hello_done{} | #certificate{} |
+                         #certificate_request{} |
 			 #client_key_exchange{} | #finished{} | #certificate_verify{} |
 			 #hello_request{} | #next_protocol{} | #end_of_early_data{}.
 
@@ -2066,9 +2068,7 @@ certificate_types(Version) when ?TLS_LTE(Version, ?TLS_1_2) ->
 
 %% Returns encoded certificate_type if algorithm is supported
 supported_cert_type_or_empty(Algo, Type) ->
-    case proplists:get_bool(
-           Algo,
-           proplists:get_value(public_keys, crypto:supports())) of
+    case proplists:get_bool(Algo, crypto:supports(public_keys)) of
         true ->
             <<?BYTE(Type)>>;
         false ->
@@ -3752,8 +3752,7 @@ convert_hostname(SNI) ->
     SNI.
 
 client_ecc_extensions(SupportedECCs) ->
-    CryptoSupport = proplists:get_value(public_keys, crypto:supports()),
-    case proplists:get_bool(ecdh, CryptoSupport) of
+    case proplists:get_bool(ecdh, crypto:supports(public_keys)) of
 	true ->
             %% RFC 8422 - 5.1.  Client Hello Extensions
             %% Clients SHOULD send both the Supported Elliptic Curves Extension and the
@@ -3768,8 +3767,7 @@ client_ecc_extensions(SupportedECCs) ->
     end.
 
 server_ecc_extension(_Version, EcPointFormats) ->
-    CryptoSupport = proplists:get_value(public_keys, crypto:supports()),
-    case proplists:get_bool(ecdh, CryptoSupport) of
+    case proplists:get_bool(ecdh, crypto:supports(public_keys)) of
 	true ->
 	    handle_ecc_point_fmt_extension(EcPointFormats);
 	false ->

lib/ssl/src/ssl_handshake.erl

@@ -349,7 +349,7 @@ is_higher(_, _) ->
 
 
 %%--------------------------------------------------------------------
--spec supported_protocol_versions() -> [tls_version()].					 
+-spec supported_protocol_versions() -> [tls_version()].
 %%
 %% Description: Protocol versions supported
 %%--------------------------------------------------------------------
@@ -378,32 +378,31 @@ supported_protocol_versions([]) ->
 supported_protocol_versions([_|_] = Vsns) ->
     sufficient_support(Vsns).
 
-sufficient_crypto_support(Version) ->
-    sufficient_crypto_support(crypto:supports(), Version).
-
-sufficient_crypto_support(CryptoSupport, Version) when Version == 'tlsv1';
-                                                       Version == 'tlsv1.1' ->
-    Hashes =  proplists:get_value(hashs, CryptoSupport),
-    PKeys =  proplists:get_value(public_keys, CryptoSupport),
-    proplists:get_bool(sha, Hashes) 
+sufficient_crypto_support(Version) when Version == 'tlsv1';
+                                        Version == 'tlsv1.1' ->
+    Hashes = crypto:supports(hashs),
+    PKeys = crypto:supports(public_keys),
+    proplists:get_bool(sha, Hashes)
+        andalso
+        proplists:get_bool(md5, Hashes)
         andalso
-        proplists:get_bool(md5, Hashes) 
-        andalso 
-        proplists:get_bool(aes_cbc, proplists:get_value(ciphers, CryptoSupport)) 
+        proplists:get_bool(aes_cbc, crypto:supports(ciphers))
         andalso
-          (proplists:get_bool(ecdsa, PKeys) orelse proplists:get_bool(rsa, PKeys) orelse proplists:get_bool(dss, PKeys)) 
+          (proplists:get_bool(ecdsa, PKeys) orelse proplists:get_bool(rsa, PKeys) orelse
+           proplists:get_bool(dss, PKeys))
         andalso
           (proplists:get_bool(ecdh, PKeys) orelse proplists:get_bool(dh, PKeys));
 
-sufficient_crypto_support(CryptoSupport, 'tlsv1.2') ->
-    PKeys =  proplists:get_value(public_keys, CryptoSupport),
-    (proplists:get_bool(sha256, proplists:get_value(hashs, CryptoSupport)))
-        andalso 
-          (proplists:get_bool(aes_cbc, proplists:get_value(ciphers, CryptoSupport)))
+sufficient_crypto_support('tlsv1.2') ->
+    PKeys =  crypto:supports(public_keys),
+    (proplists:get_bool(sha256, crypto:supports(hashs)))
         andalso
-          (proplists:get_bool(ecdsa, PKeys) orelse proplists:get_bool(rsa, PKeys) orelse proplists:get_bool(dss, PKeys)) 
+          (proplists:get_bool(aes_cbc, crypto:supports(ciphers))
         andalso
-          (proplists:get_bool(ecdh, PKeys) orelse proplists:get_bool(dh, PKeys));
+          (proplists:get_bool(ecdsa, PKeys) orelse proplists:get_bool(rsa, PKeys) orelse
+           proplists:get_bool(dss, PKeys))
+        andalso
+          (proplists:get_bool(ecdh, PKeys) orelse proplists:get_bool(dh, PKeys)));
 
 %%  A TLS-compliant application MUST implement the TLS_AES_128_GCM_SHA256
 %%  [GCM] cipher suite and SHOULD implement the TLS_AES_256_GCM_SHA384
@@ -415,9 +414,9 @@ sufficient_crypto_support(CryptoSupport, 'tlsv1.2') ->
 %%  CertificateVerify and certificates), and ecdsa_secp256r1_sha256.  A
 %%  TLS-compliant application MUST support key exchange with secp256r1
 %%  (NIST P-256) and SHOULD support key exchange with X25519 [RFC7748].
-sufficient_crypto_support(CryptoSupport, 'tlsv1.3') ->
+sufficient_crypto_support('tlsv1.3') ->
     Fun = fun({Group, Algorithm}) ->
-                  is_algorithm_supported(CryptoSupport, Group, Algorithm)
+                  is_algorithm_supported(crypto:supports(Group), Algorithm)
           end,
    %% Minimum requirement check
    L = [{ciphers, aes_gcm},                %% TLS_AES_*_GCM_*
@@ -430,12 +429,12 @@ sufficient_crypto_support(CryptoSupport, 'tlsv1.3') ->
          {curves, secp256r1}               %% key exchange with secp256r1
         ],
     lists:all(Fun, L);
-sufficient_crypto_support(CryptoSupport, Version) ->
-    sufficient_crypto_support(CryptoSupport, protocol_version(Version)).
+sufficient_crypto_support(Version) ->
+    sufficient_crypto_support(protocol_version(Version)).
 
 
-is_algorithm_supported(CryptoSupport, Group, Algorithm) ->
-    proplists:get_bool(Algorithm, proplists:get_value(Group, CryptoSupport)).
+is_algorithm_supported(CryptoSupport, Algorithm) ->
+    proplists:get_bool(Algorithm, CryptoSupport).
 
 -spec is_acceptable_version(tls_version()) -> boolean().
 is_acceptable_version(Version)
@@ -726,6 +725,5 @@ max_len(_) ->
     ?MAX_CIPHER_TEXT_LENGTH.
 
 sufficient_support(Versions) ->
-    CryptoSupport = crypto:supports(),
-    [Ver ||  Ver <- Versions, sufficient_crypto_support(CryptoSupport, Ver)].
+    [Ver ||  Ver <- Versions, sufficient_crypto_support(Ver)].
 

lib/ssl/src/tls_record.erl

@@ -884,9 +884,8 @@ rsa_exclusive(_) ->
 signature_algs(?TLS_1_3, HashSigns) ->
     signature_algs(?TLS_1_2, HashSigns);
 signature_algs(?TLS_1_2, HashSigns) ->
-    CryptoSupports =  crypto:supports(),
-    Hashes = proplists:get_value(hashs, CryptoSupports),
-    PubKeys = proplists:get_value(public_keys, CryptoSupports),
+    Hashes = crypto:supports(hashs),
+    PubKeys = crypto:supports(public_keys),
     Schemes =  rsa_schemes(),
     Supported = lists:foldl(fun({Hash, dsa = Sign} = Alg, Acc) ->
 				    case proplists:get_bool(dss, PubKeys)
@@ -922,7 +921,7 @@ signature_algs(?TLS_1_2, HashSigns) ->
 default_signature_algs([?TLS_1_3]) ->
     default_signature_schemes(?TLS_1_3) ++ legacy_signature_schemes(?TLS_1_3);
 default_signature_algs([?TLS_1_3, ?TLS_1_2 | _]) ->
-    default_signature_schemes(?TLS_1_3) ++ legacy_signature_schemes(?TLS_1_3) 
+    default_signature_schemes(?TLS_1_3) ++ legacy_signature_schemes(?TLS_1_3)
         ++ default_pre_1_3_signature_algs_only();
 default_signature_algs([?TLS_1_2 = Version |_]) ->
     Default = [%% SHA2 ++ PSS
@@ -956,12 +955,11 @@ legacy_signature_algs_pre_13() ->
 
 signature_schemes(Version, [_|_] =SignatureSchemes) when is_tuple(Version)
                                                          andalso ?TLS_GTE(Version, ?TLS_1_2) ->
-    CryptoSupports =  crypto:supports(),
-    Hashes = proplists:get_value(hashs, CryptoSupports),
-    PubKeys = proplists:get_value(public_keys, CryptoSupports),
-    Curves = proplists:get_value(curves, CryptoSupports),
-    RSAPSSSupported = lists:member(rsa_pkcs1_pss_padding,
-                                   proplists:get_value(rsa_opts, CryptoSupports)),
+    Hashes = crypto:supports(hashs),
+    PubKeys = crypto:supports(public_keys),
+    Curves = crypto:supports(curves),
+    RSAOpts = crypto:supports(rsa_opts),
+    RSAPSSSupported = lists:member(rsa_pkcs1_pss_padding, RSAOpts),
     Fun = fun(mldsa44 = Scheme, Acc)->
                   [Scheme | Acc];
              (mldsa65 = Scheme, Acc)->
@@ -1081,9 +1079,7 @@ legacy_signature_schemes(Version) ->
     signature_schemes(Version, LegacySchemes).
 
 rsa_schemes() ->
-    Supports = crypto:supports(),
-    RSAOpts = proplists:get_value(rsa_opts, Supports),
-
+    RSAOpts = crypto:supports(rsa_opts),
     case lists:member(rsa_pkcs1_pss_padding, RSAOpts)
         andalso lists:member(rsa_pss_saltlen, RSAOpts)
         andalso lists:member(rsa_mgf1_md, RSAOpts) of
@@ -1120,7 +1116,8 @@ hkdf_expand(Algo, PseudoRandKey, ContextInfo, Length, N, N, Prev, Acc) ->
     binary:part(<<Acc/binary, Keyingmaterial/binary>>, {0, Length});
 hkdf_expand(Algo, PseudoRandKey, ContextInfo, Length, M, N, Prev, Acc) ->
     Keyingmaterial = hmac_hash(Algo, PseudoRandKey, <<Prev/binary, ContextInfo/binary, ?BYTE(M)>>),
-    hkdf_expand(Algo, PseudoRandKey, ContextInfo, Length, M + 1, N, Keyingmaterial, <<Acc/binary, Keyingmaterial/binary>>).
+    hkdf_expand(Algo, PseudoRandKey, ContextInfo, Length, M + 1, N,
+                Keyingmaterial, <<Acc/binary, Keyingmaterial/binary>>).
 
 %%%% HMAC and the Pseudorandom Functions RFC 2246 & 4346 - 5.%%%%
 hmac_hash(?NULL, _, _) ->