summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorBernd Edlinger <bernd.edlinger@hotmail.de>2018-01-05 18:50:09 +0100
committerBernd Edlinger <bernd.edlinger@hotmail.de>2018-01-06 15:14:57 +0100
commit643d91fea409b0f010ce990f8f0fac234ae058bc (patch)
treef75249d0e781db96eab9f7aea953b6d4df5c7cdf /include
parentcc94da4ea38cc2a4a47e0a14ef9e361a2d723eff (diff)
Stop using unimplemented cipher classes.
Add comments to no longer usable ciphers. Reviewed-by: Rich Salz <rsalz@openssl.org> (Merged from https://github.com/openssl/openssl/pull/5023)
Diffstat (limited to 'include')
-rw-r--r--include/openssl/ssl.h16
1 files changed, 8 insertions, 8 deletions
diff --git a/include/openssl/ssl.h b/include/openssl/ssl.h
index 98a106bb77..84f14f7a57 100644
--- a/include/openssl/ssl.h
+++ b/include/openssl/ssl.h
@@ -67,14 +67,14 @@ extern "C" {
# define SSL_TXT_NULL "NULL"
# define SSL_TXT_kRSA "kRSA"
-# define SSL_TXT_kDHr "kDHr"
-# define SSL_TXT_kDHd "kDHd"
-# define SSL_TXT_kDH "kDH"
+# define SSL_TXT_kDHr "kDHr"/* this cipher class has been removed */
+# define SSL_TXT_kDHd "kDHd"/* this cipher class has been removed */
+# define SSL_TXT_kDH "kDH"/* this cipher class has been removed */
# define SSL_TXT_kEDH "kEDH"/* alias for kDHE */
# define SSL_TXT_kDHE "kDHE"
-# define SSL_TXT_kECDHr "kECDHr"
-# define SSL_TXT_kECDHe "kECDHe"
-# define SSL_TXT_kECDH "kECDH"
+# define SSL_TXT_kECDHr "kECDHr"/* this cipher class has been removed */
+# define SSL_TXT_kECDHe "kECDHe"/* this cipher class has been removed */
+# define SSL_TXT_kECDH "kECDH"/* this cipher class has been removed */
# define SSL_TXT_kEECDH "kEECDH"/* alias for kECDHE */
# define SSL_TXT_kECDHE "kECDHE"
# define SSL_TXT_kPSK "kPSK"
@@ -86,8 +86,8 @@ extern "C" {
# define SSL_TXT_aRSA "aRSA"
# define SSL_TXT_aDSS "aDSS"
-# define SSL_TXT_aDH "aDH"
-# define SSL_TXT_aECDH "aECDH"
+# define SSL_TXT_aDH "aDH"/* this cipher class has been removed */
+# define SSL_TXT_aECDH "aECDH"/* this cipher class has been removed */
# define SSL_TXT_aECDSA "aECDSA"
# define SSL_TXT_aPSK "aPSK"
# define SSL_TXT_aGOST94 "aGOST94"