summaryrefslogtreecommitdiffstats
path: root/ssl/ssl_locl.h
diff options
context:
space:
mode:
authorLutz Jänicke <jaenicke@openssl.org>2002-07-10 06:41:29 +0000
committerLutz Jänicke <jaenicke@openssl.org>2002-07-10 06:41:29 +0000
commitd2cbe66ee1ca364f69a7ac5e1ba07a850459a2e1 (patch)
treea5dc06466e6600b87d69248a0bcaa3902a50303f /ssl/ssl_locl.h
parent7d0e1c1188f7878e5f8c559425acd420a88d6bec (diff)
Ciphers with NULL encryption were not properly handled because they were
not covered by the strength bit mask. Submitted by: Reviewed by: PR: 130
Diffstat (limited to 'ssl/ssl_locl.h')
-rw-r--r--ssl/ssl_locl.h15
1 files changed, 8 insertions, 7 deletions
diff --git a/ssl/ssl_locl.h b/ssl/ssl_locl.h
index 516d3cc5ae..9297cd2dc3 100644
--- a/ssl/ssl_locl.h
+++ b/ssl/ssl_locl.h
@@ -283,16 +283,17 @@
#define SSL_NOT_EXP 0x00000001L
#define SSL_EXPORT 0x00000002L
-#define SSL_STRONG_MASK 0x0000007cL
-#define SSL_EXP40 0x00000004L
+#define SSL_STRONG_MASK 0x000000fcL
+#define SSL_STRONG_NONE 0x00000004L
+#define SSL_EXP40 0x00000008L
#define SSL_MICRO (SSL_EXP40)
-#define SSL_EXP56 0x00000008L
+#define SSL_EXP56 0x00000010L
#define SSL_MINI (SSL_EXP56)
-#define SSL_LOW 0x00000010L
-#define SSL_MEDIUM 0x00000020L
-#define SSL_HIGH 0x00000040L
+#define SSL_LOW 0x00000020L
+#define SSL_MEDIUM 0x00000040L
+#define SSL_HIGH 0x00000080L
-/* we have used 0000007f - 25 bits left to go */
+/* we have used 000000ff - 24 bits left to go */
/*
* Macros to check the export status and cipher strength for export ciphers.