diff options
| author | Ingela Anderton Andin <[email protected]> | 2019-04-30 16:52:11 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2019-04-30 17:19:20 +0200 |
| commit | 01d2d677916d5143b6e501bb7230d1ad13592ede (patch) | |
| tree | c3b753f8f79aff4ba61320dee3b3bd1340e1f2d7 /lib/ssl/src | |
| parent | 4507360b4701b48cf33f7f2251626da29bc8176a (diff) | |
| download | otp-01d2d677916d5143b6e501bb7230d1ad13592ede.tar.gz otp-01d2d677916d5143b6e501bb7230d1ad13592ede.tar.bz2 otp-01d2d677916d5143b6e501bb7230d1ad13592ede.zip | |
ssl: Fix cherry-pick mistakes
Diffstat (limited to 'lib/ssl/src')
| -rw-r--r-- | lib/ssl/src/ssl.erl | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/lib/ssl/src/ssl.erl b/lib/ssl/src/ssl.erl index 51e3b9e6ab..7c1d0a3829 100644 --- a/lib/ssl/src/ssl.erl +++ b/lib/ssl/src/ssl.erl @@ -175,9 +175,6 @@ secp160r1 | secp160r2. --type group() :: secp256r1 | secp384r1 | secp521r1 | ffdhe2048 | - ffdhe3072 | ffdhe4096 | ffdhe6144 | ffdhe8192. - -type srp_param_type() :: srp_1024 | srp_1536 | srp_2048 | @@ -227,7 +224,6 @@ {keyfile, key_pem()} | {password, key_password()} | {ciphers, cipher_suites()} | - {eccs, eccs()} | {secure_renegotiate, secure_renegotiation()} | {depth, allowed_cert_chain_length()} | {verify_fun, custom_verify()} | @@ -315,7 +311,6 @@ -type ssl_imp() :: new | old. %% ------------------------------------------------------------------------------------------------------- - -type server_option() :: {cacerts, server_cacerts()} | {cacertfile, server_cafile()} | {dh, dh_der()} | |