diff options
Diffstat (limited to 'lib/ssl')
| -rw-r--r-- | lib/ssl/src/ssl_internal.hrl | 10 | ||||
| -rw-r--r-- | lib/ssl/src/tls_connection.erl | 7 |
2 files changed, 5 insertions, 12 deletions
diff --git a/lib/ssl/src/ssl_internal.hrl b/lib/ssl/src/ssl_internal.hrl index 8e5662db31..0186f9fca2 100644 --- a/lib/ssl/src/ssl_internal.hrl +++ b/lib/ssl/src/ssl_internal.hrl @@ -82,15 +82,15 @@ %% fun(Extensions, State, Verify, AccError) -> {Extensions, State, AccError} validate_extensions_fun, depth :: integer(), - certfile :: string(), + certfile :: binary(), cert :: der_encoded(), - keyfile :: string(), - key :: der_encoded(), + keyfile :: binary(), + key :: {'RSAPrivateKey' | 'DSAPrivateKey' | 'ECPrivateKey' | 'PrivateKeyInfo', der_encoded()}, password :: string(), cacerts :: [der_encoded()], - cacertfile :: string(), + cacertfile :: binary(), dh :: der_encoded(), - dhfile :: string(), + dhfile :: binary(), user_lookup_fun, % server option, fun to lookup the user psk_identity :: binary(), srp_identity, % client option {User, Password} diff --git a/lib/ssl/src/tls_connection.erl b/lib/ssl/src/tls_connection.erl index e4201504c0..c8380c109c 100644 --- a/lib/ssl/src/tls_connection.erl +++ b/lib/ssl/src/tls_connection.erl @@ -877,13 +877,6 @@ init_private_key(DbHandle, undefined, KeyFile, Password, _) -> file_error(KeyFile, {keyfile, Reason}) end; -%% First two clauses are for backwards compatibility -init_private_key(_,{rsa, PrivateKey}, _, _,_) -> - init_private_key('RSAPrivateKey', PrivateKey); -init_private_key(_,{dsa, PrivateKey},_,_,_) -> - init_private_key('DSAPrivateKey', PrivateKey); -init_private_key(_,{ec, PrivateKey},_,_,_) -> - init_private_key('ECPrivateKey', PrivateKey); init_private_key(_,{Asn1Type, PrivateKey},_,_,_) -> private_key(init_private_key(Asn1Type, PrivateKey)). |