diff options
author | Ingela Anderton Andin <[email protected]> | 2019-02-18 16:59:41 +0100 |
---|---|---|
committer | Ingela Anderton Andin <[email protected]> | 2019-02-18 17:35:07 +0100 |
commit | 90885d08ccfc2cad4ba87f5a85decc979de56702 (patch) | |
tree | 8ec8bbb822610bd98e3a9e933e2dd8873f8e7f7e /lib/ssl/src/ssl.erl | |
parent | fde162310c3fab0fea924b005a383129acf569c9 (diff) | |
download | otp-90885d08ccfc2cad4ba87f5a85decc979de56702.tar.gz otp-90885d08ccfc2cad4ba87f5a85decc979de56702.tar.bz2 otp-90885d08ccfc2cad4ba87f5a85decc979de56702.zip |
ssl: Correct merge commit thanks to dialyzer
Also make a weaker spec in ssl_internal.hrl for now as it creates
a conflict between error handling and dialyzer warnings.
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 ]). |