diff options
| author | Ingela Andin <[email protected]> | 2018-09-06 11:46:06 +0200 |
|---|---|---|
| committer | GitHub <[email protected]> | 2018-09-06 11:46:06 +0200 |
| commit | 1cca9ffa82cab9e64a7e0c58dd9c4ea04f62dc0b (patch) | |
| tree | 1a31d480735c4f18a59a2cac713b3f273c379f5f /lib | |
| parent | 04f84f580929b5e23ac6014998b9ec34efa13038 (diff) | |
| parent | 07c4928d48a65f240f83668838cf179140514afd (diff) | |
| download | otp-1cca9ffa82cab9e64a7e0c58dd9c4ea04f62dc0b.tar.gz otp-1cca9ffa82cab9e64a7e0c58dd9c4ea04f62dc0b.tar.bz2 otp-1cca9ffa82cab9e64a7e0c58dd9c4ea04f62dc0b.zip | |
Merge pull request #1951 from lasseebert/fix_ssl_typespec
Correct dialyzer spec for key option
OTP-15281
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/ssl/src/ssl_api.hrl | 10 |
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). |