diff options
| author | Ingela Anderton Andin <[email protected]> | 2011-03-17 18:30:57 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2011-03-24 10:56:56 +0100 |
| commit | fbaa5e3ddf028ba0e2b58a19609817ee17b10c6f (patch) | |
| tree | ffb4a7794f04035fae98513bcb982a9476c5af82 /lib/ssl/src/ssl.erl | |
| parent | dea83e25a671b0bc2661582c3227c1728d69bfea (diff) | |
| download | otp-fbaa5e3ddf028ba0e2b58a19609817ee17b10c6f.tar.gz otp-fbaa5e3ddf028ba0e2b58a19609817ee17b10c6f.tar.bz2 otp-fbaa5e3ddf028ba0e2b58a19609817ee17b10c6f.zip | |
Implemented encode/decode support for ssh public key files
Diffstat (limited to 'lib/ssl/src/ssl.erl')
| -rw-r--r-- | lib/ssl/src/ssl.erl | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/lib/ssl/src/ssl.erl b/lib/ssl/src/ssl.erl index 3512e194bc..7b1fda4cf9 100644 --- a/lib/ssl/src/ssl.erl +++ b/lib/ssl/src/ssl.erl @@ -52,13 +52,12 @@ -type option() :: socketoption() | ssloption() | transportoption(). -type socketoption() :: [{property(), term()}]. %% See gen_tcp and inet -type property() :: atom(). - -type ssloption() :: {verify, verify_type()} | {verify_fun, {fun(), InitialUserState::term()}} | {fail_if_no_peer_cert, boolean()} | {depth, integer()} | - {cert, der_encoded()} | {certfile, path()} | {key, der_encoded()} | - {keyfile, path()} | {password, string()} | {cacerts, [der_encoded()]} | - {cacertfile, path()} | {dh, der_encoded()} | {dhfile, path()} | + {cert, Der::binary()} | {certfile, path()} | {key, Der::binary()} | + {keyfile, path()} | {password, string()} | {cacerts, [Der::binary()]} | + {cacertfile, path()} | {dh, Der::binary()} | {dhfile, path()} | {ciphers, ciphers()} | {ssl_imp, ssl_imp()} | {reuse_sessions, boolean()} | {reuse_session, fun()} | {hibernate_after, integer()|undefined}. |