diff options
author | Ingela Anderton Andin <[email protected]> | 2019-02-18 17:39:56 +0100 |
---|---|---|
committer | Ingela Anderton Andin <[email protected]> | 2019-02-18 17:39:56 +0100 |
commit | c73eea04a49fe50364c67987ae520eb12d2b064c (patch) | |
tree | 8ec8bbb822610bd98e3a9e933e2dd8873f8e7f7e /lib/ssl/src/ssl.erl | |
parent | fde162310c3fab0fea924b005a383129acf569c9 (diff) | |
parent | 90885d08ccfc2cad4ba87f5a85decc979de56702 (diff) | |
download | otp-c73eea04a49fe50364c67987ae520eb12d2b064c.tar.gz otp-c73eea04a49fe50364c67987ae520eb12d2b064c.tar.bz2 otp-c73eea04a49fe50364c67987ae520eb12d2b064c.zip |
Merge branch 'ingela/ssl/dialyzer'
* ingela/ssl/dialyzer:
ssl: Correct merge commit thanks to dialyzer
Diffstat (limited to 'lib/ssl/src/ssl.erl')
-rw-r--r-- | lib/ssl/src/ssl.erl | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/ssl/src/ssl.erl b/lib/ssl/src/ssl.erl index fed7aa1141..d06f61f17d 100644 --- a/lib/ssl/src/ssl.erl +++ b/lib/ssl/src/ssl.erl @@ -87,6 +87,7 @@ private_key_type/0, cipher/0, hash/0, + key/0, key_algo/0, sign_algo/0 ]). |