aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssl/src
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2018-09-06 11:57:01 +0200
committerIngela Anderton Andin <[email protected]>2018-09-06 11:57:01 +0200
commit22c94c8d9b10efbb65e12755ecf73d8f30acfb8d (patch)
treed12ab222ca8d19510935b9c7fd2b74552dec4392 /lib/ssl/src
parent26e03d10c6c51868640869da8b091efdeab28bb0 (diff)
parent1cca9ffa82cab9e64a7e0c58dd9c4ea04f62dc0b (diff)
downloadotp-22c94c8d9b10efbb65e12755ecf73d8f30acfb8d.tar.gz
otp-22c94c8d9b10efbb65e12755ecf73d8f30acfb8d.tar.bz2
otp-22c94c8d9b10efbb65e12755ecf73d8f30acfb8d.zip
Merge branch 'maint'
Diffstat (limited to 'lib/ssl/src')
-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).