aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLasse Skindstad Ebert <[email protected]>2018-09-04 12:32:32 +0200
committerLasse Skindstad Ebert <[email protected]>2018-09-04 12:37:00 +0200
commit07c4928d48a65f240f83668838cf179140514afd (patch)
tree5d74043e117ccc79802cd74f8e605641c98e099e
parent5801fcb2b36e04c433dcf0b90a8c47b86e34fc07 (diff)
downloadotp-07c4928d48a65f240f83668838cf179140514afd.tar.gz
otp-07c4928d48a65f240f83668838cf179140514afd.tar.bz2
otp-07c4928d48a65f240f83668838cf179140514afd.zip
Fixed ssl_options typespec for key
-rw-r--r--lib/ssl/src/ssl_api.hrl10
1 files changed, 9 insertions, 1 deletions
diff --git a/lib/ssl/src/ssl_api.hrl b/lib/ssl/src/ssl_api.hrl
index 144323c572..7579b56ab0 100644
--- a/lib/ssl/src/ssl_api.hrl
+++ b/lib/ssl/src/ssl_api.hrl
@@ -42,7 +42,8 @@
{verify, verify_type()} |
{verify_fun, {fun(), InitialUserState::term()}} |
{fail_if_no_peer_cert, boolean()} | {depth, integer()} |
- {cert, Der::binary()} | {certfile, path()} | {key, Der::binary()} |
+ {cert, Der::binary()} | {certfile, path()} |
+ {key, {private_key_type(), Der::binary()}} |
{keyfile, path()} | {password, string()} | {cacerts, [Der::binary()]} |
{cacertfile, path()} | {dh, Der::binary()} | {dhfile, path()} |
{user_lookup_fun, {fun(), InitialUserState::term()}} |
@@ -65,4 +66,11 @@
ClosedTag::atom(), ErrTag::atom()}}.
-type prf_random() :: client_random | server_random.
+-type private_key_type() :: rsa | %% Backwards compatibility
+ dsa | %% Backwards compatibility
+ 'RSAPrivateKey' |
+ 'DSAPrivateKey' |
+ 'ECPrivateKey' |
+ 'PrivateKeyInfo'.
+
-endif. % -ifdef(ssl_api).