From 01d2d677916d5143b6e501bb7230d1ad13592ede Mon Sep 17 00:00:00 2001
From: Ingela Anderton Andin <ingela@erlang.org>
Date: Tue, 30 Apr 2019 16:52:11 +0200
Subject: ssl: Fix cherry-pick mistakes

---
 lib/ssl/doc/src/ssl.xml | 9 +--------
 lib/ssl/src/ssl.erl     | 5 -----
 2 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/lib/ssl/doc/src/ssl.xml b/lib/ssl/doc/src/ssl.xml
index 2ab21f43e0..c448d345de 100644
--- a/lib/ssl/doc/src/ssl.xml
+++ b/lib/ssl/doc/src/ssl.xml
@@ -332,14 +332,7 @@
 	matters.</p>
       </desc>
     </datatype>
-    
-    <datatype>
-      <name name="eccs"/>
-      <desc><p> Allows to specify the order of preference for named curves
-      and to restrict their usage when using a cipher suite supporting them.</p>
-      </desc>
-    </datatype>
-    
+
     <datatype>
       <name name="secure_renegotiation"/>
       <desc><p>Specifies if to reject renegotiation attempt that does
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()} |
-- 
cgit v1.2.3