diff options
author | Ingela Anderton Andin <[email protected]> | 2018-08-23 16:11:54 +0200 |
---|---|---|
committer | Ingela Anderton Andin <[email protected]> | 2018-08-23 16:11:54 +0200 |
commit | 2ce155ca0de6890cd5750d97a6593d67d4d940f7 (patch) | |
tree | 25abf8777c196deaad73aea8be5c72a32e9217ef /lib/ssl/src/ssl_api.hrl | |
parent | c30530b3b3512668d9851cd8b88a7d4ad6aeafc3 (diff) | |
parent | 487f0c12e8700d31161a3bbb9c36e360aff484ac (diff) | |
download | otp-2ce155ca0de6890cd5750d97a6593d67d4d940f7.tar.gz otp-2ce155ca0de6890cd5750d97a6593d67d4d940f7.tar.bz2 otp-2ce155ca0de6890cd5750d97a6593d67d4d940f7.zip |
Merge branch 'maint'
Conflicts:
lib/ssl/src/tls_v1.erl
Diffstat (limited to 'lib/ssl/src/ssl_api.hrl')
-rw-r--r-- | lib/ssl/src/ssl_api.hrl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ssl/src/ssl_api.hrl b/lib/ssl/src/ssl_api.hrl index 2bd51cf91e..144323c572 100644 --- a/lib/ssl/src/ssl_api.hrl +++ b/lib/ssl/src/ssl_api.hrl @@ -57,7 +57,7 @@ -type verify_type() :: verify_none | verify_peer. -type path() :: string(). --type ciphers() :: [ssl_cipher:erl_cipher_suite()] | +-type ciphers() :: [ssl_cipher_format:erl_cipher_suite()] | string(). % (according to old API) -type ssl_imp() :: new | old. |