From fd03fdc872e2b02959e82767f19c00043e3812c2 Mon Sep 17 00:00:00 2001
From: jsing <>
Date: Tue, 8 Jul 2014 21:31:54 +0000
Subject: Nuke SSL_NOT_EXP since it does nothing.

ok deraadt@ miod@
---
 src/lib/libssl/s3_lib.c           | 248 +++++++++++++++++++-------------------
 src/lib/libssl/src/ssl/s3_lib.c   | 248 +++++++++++++++++++-------------------
 src/lib/libssl/src/ssl/ssl_locl.h |   3 +-
 src/lib/libssl/ssl_locl.h         |   3 +-
 4 files changed, 250 insertions(+), 252 deletions(-)

(limited to 'src/lib')

diff --git a/src/lib/libssl/s3_lib.c b/src/lib/libssl/s3_lib.c
index 1e8eaa99d4..261bd2d4f6 100644
--- a/src/lib/libssl/s3_lib.c
+++ b/src/lib/libssl/s3_lib.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: s3_lib.c,v 1.62 2014/06/21 16:51:48 jsing Exp $ */
+/* $OpenBSD: s3_lib.c,v 1.63 2014/07/08 21:31:54 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -180,7 +180,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_eNULL,
 		.algorithm_mac = SSL_MD5,
 		.algorithm_ssl = SSL_SSLV3,
-		.algo_strength = SSL_NOT_EXP|SSL_STRONG_NONE,
+		.algo_strength = SSL_STRONG_NONE,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
 		.strength_bits = 0,
 		.alg_bits = 0,
@@ -196,7 +196,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_eNULL,
 		.algorithm_mac = SSL_SHA1,
 		.algorithm_ssl = SSL_SSLV3,
-		.algo_strength = SSL_NOT_EXP|SSL_STRONG_NONE|SSL_FIPS,
+		.algo_strength = SSL_STRONG_NONE|SSL_FIPS,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
 		.strength_bits = 0,
 		.alg_bits = 0,
@@ -228,7 +228,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_RC4,
 		.algorithm_mac = SSL_MD5,
 		.algorithm_ssl = SSL_SSLV3,
-		.algo_strength = SSL_NOT_EXP|SSL_MEDIUM,
+		.algo_strength = SSL_MEDIUM,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
 		.strength_bits = 128,
 		.alg_bits = 128,
@@ -244,7 +244,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_RC4,
 		.algorithm_mac = SSL_SHA1,
 		.algorithm_ssl = SSL_SSLV3,
-		.algo_strength = SSL_NOT_EXP|SSL_MEDIUM,
+		.algo_strength = SSL_MEDIUM,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
 		.strength_bits = 128,
 		.alg_bits = 128,
@@ -277,7 +277,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_IDEA,
 		.algorithm_mac = SSL_SHA1,
 		.algorithm_ssl = SSL_SSLV3,
-		.algo_strength = SSL_NOT_EXP|SSL_MEDIUM,
+		.algo_strength = SSL_MEDIUM,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
 		.strength_bits = 128,
 		.alg_bits = 128,
@@ -310,7 +310,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_DES,
 		.algorithm_mac = SSL_SHA1,
 		.algorithm_ssl = SSL_SSLV3,
-		.algo_strength = SSL_NOT_EXP|SSL_LOW,
+		.algo_strength = SSL_LOW,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
 		.strength_bits = 56,
 		.alg_bits = 56,
@@ -326,7 +326,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_3DES,
 		.algorithm_mac = SSL_SHA1,
 		.algorithm_ssl = SSL_SSLV3,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+		.algo_strength = SSL_HIGH|SSL_FIPS,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
 		.strength_bits = 112,
 		.alg_bits = 168,
@@ -359,7 +359,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_DES,
 		.algorithm_mac = SSL_SHA1,
 		.algorithm_ssl = SSL_SSLV3,
-		.algo_strength = SSL_NOT_EXP|SSL_LOW,
+		.algo_strength = SSL_LOW,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
 		.strength_bits = 56,
 		.alg_bits = 56,
@@ -375,7 +375,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_3DES,
 		.algorithm_mac = SSL_SHA1,
 		.algorithm_ssl = SSL_SSLV3,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+		.algo_strength = SSL_HIGH|SSL_FIPS,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
 		.strength_bits = 112,
 		.alg_bits = 168,
@@ -407,7 +407,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_DES,
 		.algorithm_mac = SSL_SHA1,
 		.algorithm_ssl = SSL_SSLV3,
-		.algo_strength = SSL_NOT_EXP|SSL_LOW,
+		.algo_strength = SSL_LOW,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
 		.strength_bits = 56,
 		.alg_bits = 56,
@@ -423,7 +423,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_3DES,
 		.algorithm_mac = SSL_SHA1,
 		.algorithm_ssl = SSL_SSLV3,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+		.algo_strength = SSL_HIGH|SSL_FIPS,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
 		.strength_bits = 112,
 		.alg_bits = 168,
@@ -456,7 +456,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_DES,
 		.algorithm_mac = SSL_SHA1,
 		.algorithm_ssl = SSL_SSLV3,
-		.algo_strength = SSL_NOT_EXP|SSL_LOW,
+		.algo_strength = SSL_LOW,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
 		.strength_bits = 56,
 		.alg_bits = 56,
@@ -472,7 +472,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_3DES,
 		.algorithm_mac = SSL_SHA1,
 		.algorithm_ssl = SSL_SSLV3,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+		.algo_strength = SSL_HIGH|SSL_FIPS,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
 		.strength_bits = 112,
 		.alg_bits = 168,
@@ -504,7 +504,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_DES,
 		.algorithm_mac = SSL_SHA1,
 		.algorithm_ssl = SSL_SSLV3,
-		.algo_strength = SSL_NOT_EXP|SSL_LOW,
+		.algo_strength = SSL_LOW,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
 		.strength_bits = 56,
 		.alg_bits = 56,
@@ -520,7 +520,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_3DES,
 		.algorithm_mac = SSL_SHA1,
 		.algorithm_ssl = SSL_SSLV3,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+		.algo_strength = SSL_HIGH|SSL_FIPS,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
 		.strength_bits = 112,
 		.alg_bits = 168,
@@ -552,7 +552,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_RC4,
 		.algorithm_mac = SSL_MD5,
 		.algorithm_ssl = SSL_SSLV3,
-		.algo_strength = SSL_NOT_EXP|SSL_MEDIUM,
+		.algo_strength = SSL_MEDIUM,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
 		.strength_bits = 128,
 		.alg_bits = 128,
@@ -584,7 +584,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_DES,
 		.algorithm_mac = SSL_SHA1,
 		.algorithm_ssl = SSL_SSLV3,
-		.algo_strength = SSL_NOT_EXP|SSL_LOW,
+		.algo_strength = SSL_LOW,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
 		.strength_bits = 56,
 		.alg_bits = 56,
@@ -600,7 +600,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_3DES,
 		.algorithm_mac = SSL_SHA1,
 		.algorithm_ssl = SSL_SSLV3,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+		.algo_strength = SSL_HIGH|SSL_FIPS,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
 		.strength_bits = 112,
 		.alg_bits = 168,
@@ -617,7 +617,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_AES128,
 		.algorithm_mac = SSL_SHA1,
 		.algorithm_ssl = SSL_TLSV1,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+		.algo_strength = SSL_HIGH|SSL_FIPS,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
 		.strength_bits = 128,
 		.alg_bits = 128,
@@ -632,7 +632,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_AES128,
 		.algorithm_mac = SSL_SHA1,
 		.algorithm_ssl = SSL_TLSV1,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+		.algo_strength = SSL_HIGH|SSL_FIPS,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
 		.strength_bits = 128,
 		.alg_bits = 128,
@@ -647,7 +647,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_AES128,
 		.algorithm_mac = SSL_SHA1,
 		.algorithm_ssl = SSL_TLSV1,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+		.algo_strength = SSL_HIGH|SSL_FIPS,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
 		.strength_bits = 128,
 		.alg_bits = 128,
@@ -662,7 +662,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_AES128,
 		.algorithm_mac = SSL_SHA1,
 		.algorithm_ssl = SSL_TLSV1,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+		.algo_strength = SSL_HIGH|SSL_FIPS,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
 		.strength_bits = 128,
 		.alg_bits = 128,
@@ -677,7 +677,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_AES128,
 		.algorithm_mac = SSL_SHA1,
 		.algorithm_ssl = SSL_TLSV1,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+		.algo_strength = SSL_HIGH|SSL_FIPS,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
 		.strength_bits = 128,
 		.alg_bits = 128,
@@ -692,7 +692,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_AES128,
 		.algorithm_mac = SSL_SHA1,
 		.algorithm_ssl = SSL_TLSV1,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+		.algo_strength = SSL_HIGH|SSL_FIPS,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
 		.strength_bits = 128,
 		.alg_bits = 128,
@@ -708,7 +708,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_AES256,
 		.algorithm_mac = SSL_SHA1,
 		.algorithm_ssl = SSL_TLSV1,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+		.algo_strength = SSL_HIGH|SSL_FIPS,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
 		.strength_bits = 256,
 		.alg_bits = 256,
@@ -723,7 +723,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_AES256,
 		.algorithm_mac = SSL_SHA1,
 		.algorithm_ssl = SSL_TLSV1,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+		.algo_strength = SSL_HIGH|SSL_FIPS,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
 		.strength_bits = 256,
 		.alg_bits = 256,
@@ -739,7 +739,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_AES256,
 		.algorithm_mac = SSL_SHA1,
 		.algorithm_ssl = SSL_TLSV1,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+		.algo_strength = SSL_HIGH|SSL_FIPS,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
 		.strength_bits = 256,
 		.alg_bits = 256,
@@ -755,7 +755,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_AES256,
 		.algorithm_mac = SSL_SHA1,
 		.algorithm_ssl = SSL_TLSV1,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+		.algo_strength = SSL_HIGH|SSL_FIPS,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
 		.strength_bits = 256,
 		.alg_bits = 256,
@@ -771,7 +771,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_AES256,
 		.algorithm_mac = SSL_SHA1,
 		.algorithm_ssl = SSL_TLSV1,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+		.algo_strength = SSL_HIGH|SSL_FIPS,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
 		.strength_bits = 256,
 		.alg_bits = 256,
@@ -787,7 +787,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_AES256,
 		.algorithm_mac = SSL_SHA1,
 		.algorithm_ssl = SSL_TLSV1,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+		.algo_strength = SSL_HIGH|SSL_FIPS,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
 		.strength_bits = 256,
 		.alg_bits = 256,
@@ -804,7 +804,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_eNULL,
 		.algorithm_mac = SSL_SHA256,
 		.algorithm_ssl = SSL_TLSV1_2,
-		.algo_strength = SSL_NOT_EXP|SSL_STRONG_NONE|SSL_FIPS,
+		.algo_strength = SSL_STRONG_NONE|SSL_FIPS,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
 		.strength_bits = 0,
 		.alg_bits = 0,
@@ -820,7 +820,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_AES128,
 		.algorithm_mac = SSL_SHA256,
 		.algorithm_ssl = SSL_TLSV1_2,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+		.algo_strength = SSL_HIGH|SSL_FIPS,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
 		.strength_bits = 128,
 		.alg_bits = 128,
@@ -836,7 +836,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_AES256,
 		.algorithm_mac = SSL_SHA256,
 		.algorithm_ssl = SSL_TLSV1_2,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+		.algo_strength = SSL_HIGH|SSL_FIPS,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
 		.strength_bits = 256,
 		.alg_bits = 256,
@@ -852,7 +852,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_AES128,
 		.algorithm_mac = SSL_SHA256,
 		.algorithm_ssl = SSL_TLSV1_2,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+		.algo_strength = SSL_HIGH|SSL_FIPS,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
 		.strength_bits = 128,
 		.alg_bits = 128,
@@ -868,7 +868,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_AES128,
 		.algorithm_mac = SSL_SHA256,
 		.algorithm_ssl = SSL_TLSV1_2,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+		.algo_strength = SSL_HIGH|SSL_FIPS,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
 		.strength_bits = 128,
 		.alg_bits = 128,
@@ -884,7 +884,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_AES128,
 		.algorithm_mac = SSL_SHA256,
 		.algorithm_ssl = SSL_TLSV1_2,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+		.algo_strength = SSL_HIGH|SSL_FIPS,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
 		.strength_bits = 128,
 		.alg_bits = 128,
@@ -903,7 +903,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_CAMELLIA128,
 		.algorithm_mac = SSL_SHA1,
 		.algorithm_ssl = SSL_TLSV1,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH,
+		.algo_strength = SSL_HIGH,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
 		.strength_bits = 128,
 		.alg_bits = 128,
@@ -919,7 +919,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_CAMELLIA128,
 		.algorithm_mac = SSL_SHA1,
 		.algorithm_ssl = SSL_TLSV1,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH,
+		.algo_strength = SSL_HIGH,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
 		.strength_bits = 128,
 		.alg_bits = 128,
@@ -935,7 +935,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_CAMELLIA128,
 		.algorithm_mac = SSL_SHA1,
 		.algorithm_ssl = SSL_TLSV1,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH,
+		.algo_strength = SSL_HIGH,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
 		.strength_bits = 128,
 		.alg_bits = 128,
@@ -951,7 +951,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_CAMELLIA128,
 		.algorithm_mac = SSL_SHA1,
 		.algorithm_ssl = SSL_TLSV1,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH,
+		.algo_strength = SSL_HIGH,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
 		.strength_bits = 128,
 		.alg_bits = 128,
@@ -967,7 +967,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_CAMELLIA128,
 		.algorithm_mac = SSL_SHA1,
 		.algorithm_ssl = SSL_TLSV1,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH,
+		.algo_strength = SSL_HIGH,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
 		.strength_bits = 128,
 		.alg_bits = 128,
@@ -983,7 +983,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_CAMELLIA128,
 		.algorithm_mac = SSL_SHA1,
 		.algorithm_ssl = SSL_TLSV1,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH,
+		.algo_strength = SSL_HIGH,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
 		.strength_bits = 128,
 		.alg_bits = 128,
@@ -1001,7 +1001,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_AES128,
 		.algorithm_mac = SSL_SHA256,
 		.algorithm_ssl = SSL_TLSV1_2,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+		.algo_strength = SSL_HIGH|SSL_FIPS,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
 		.strength_bits = 128,
 		.alg_bits = 128,
@@ -1017,7 +1017,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_AES256,
 		.algorithm_mac = SSL_SHA256,
 		.algorithm_ssl = SSL_TLSV1_2,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+		.algo_strength = SSL_HIGH|SSL_FIPS,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
 		.strength_bits = 256,
 		.alg_bits = 256,
@@ -1033,7 +1033,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_AES256,
 		.algorithm_mac = SSL_SHA256,
 		.algorithm_ssl = SSL_TLSV1_2,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+		.algo_strength = SSL_HIGH|SSL_FIPS,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
 		.strength_bits = 256,
 		.alg_bits = 256,
@@ -1049,7 +1049,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_AES256,
 		.algorithm_mac = SSL_SHA256,
 		.algorithm_ssl = SSL_TLSV1_2,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+		.algo_strength = SSL_HIGH|SSL_FIPS,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
 		.strength_bits = 256,
 		.alg_bits = 256,
@@ -1065,7 +1065,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_AES256,
 		.algorithm_mac = SSL_SHA256,
 		.algorithm_ssl = SSL_TLSV1_2,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+		.algo_strength = SSL_HIGH|SSL_FIPS,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
 		.strength_bits = 256,
 		.alg_bits = 256,
@@ -1081,7 +1081,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_AES128,
 		.algorithm_mac = SSL_SHA256,
 		.algorithm_ssl = SSL_TLSV1_2,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+		.algo_strength = SSL_HIGH|SSL_FIPS,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
 		.strength_bits = 128,
 		.alg_bits = 128,
@@ -1097,7 +1097,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_AES256,
 		.algorithm_mac = SSL_SHA256,
 		.algorithm_ssl = SSL_TLSV1_2,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+		.algo_strength = SSL_HIGH|SSL_FIPS,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
 		.strength_bits = 256,
 		.alg_bits = 256,
@@ -1114,7 +1114,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_eGOST2814789CNT,
 		.algorithm_mac = SSL_GOST89MAC,
 		.algorithm_ssl = SSL_TLSV1,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH,
+		.algo_strength = SSL_HIGH,
 		.algorithm2 = SSL_HANDSHAKE_MAC_GOST94|TLS1_PRF_GOST94|
 		    TLS1_STREAM_MAC,
 		.strength_bits = 256,
@@ -1129,7 +1129,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_eGOST2814789CNT,
 		.algorithm_mac = SSL_GOST89MAC,
 		.algorithm_ssl = SSL_TLSV1,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH,
+		.algo_strength = SSL_HIGH,
 		.algorithm2 = SSL_HANDSHAKE_MAC_GOST94|TLS1_PRF_GOST94|
 		    TLS1_STREAM_MAC,
 		.strength_bits = 256,
@@ -1144,7 +1144,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_eNULL,
 		.algorithm_mac = SSL_GOST94,
 		.algorithm_ssl = SSL_TLSV1,
-		.algo_strength = SSL_NOT_EXP|SSL_STRONG_NONE,
+		.algo_strength = SSL_STRONG_NONE,
 		.algorithm2 = SSL_HANDSHAKE_MAC_GOST94|TLS1_PRF_GOST94,
 		.strength_bits = 0,
 		.alg_bits = 0
@@ -1158,7 +1158,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_eNULL,
 		.algorithm_mac = SSL_GOST94,
 		.algorithm_ssl = SSL_TLSV1,
-		.algo_strength = SSL_NOT_EXP|SSL_STRONG_NONE,
+		.algo_strength = SSL_STRONG_NONE,
 		.algorithm2 = SSL_HANDSHAKE_MAC_GOST94|TLS1_PRF_GOST94,
 		.strength_bits = 0,
 		.alg_bits = 0
@@ -1177,7 +1177,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_CAMELLIA256,
 		.algorithm_mac = SSL_SHA1,
 		.algorithm_ssl = SSL_TLSV1,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH,
+		.algo_strength = SSL_HIGH,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
 		.strength_bits = 256,
 		.alg_bits = 256,
@@ -1193,7 +1193,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_CAMELLIA256,
 		.algorithm_mac = SSL_SHA1,
 		.algorithm_ssl = SSL_TLSV1,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH,
+		.algo_strength = SSL_HIGH,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
 		.strength_bits = 256,
 		.alg_bits = 256,
@@ -1209,7 +1209,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_CAMELLIA256,
 		.algorithm_mac = SSL_SHA1,
 		.algorithm_ssl = SSL_TLSV1,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH,
+		.algo_strength = SSL_HIGH,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
 		.strength_bits = 256,
 		.alg_bits = 256,
@@ -1225,7 +1225,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_CAMELLIA256,
 		.algorithm_mac = SSL_SHA1,
 		.algorithm_ssl = SSL_TLSV1,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH,
+		.algo_strength = SSL_HIGH,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
 		.strength_bits = 256,
 		.alg_bits = 256,
@@ -1241,7 +1241,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_CAMELLIA256,
 		.algorithm_mac = SSL_SHA1,
 		.algorithm_ssl = SSL_TLSV1,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH,
+		.algo_strength = SSL_HIGH,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
 		.strength_bits = 256,
 		.alg_bits = 256,
@@ -1257,7 +1257,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_CAMELLIA256,
 		.algorithm_mac = SSL_SHA1,
 		.algorithm_ssl = SSL_TLSV1,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH,
+		.algo_strength = SSL_HIGH,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
 		.strength_bits = 256,
 		.alg_bits = 256,
@@ -1275,7 +1275,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_RC4,
 		.algorithm_mac = SSL_SHA1,
 		.algorithm_ssl = SSL_TLSV1,
-		.algo_strength = SSL_NOT_EXP|SSL_MEDIUM,
+		.algo_strength = SSL_MEDIUM,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
 		.strength_bits = 128,
 		.alg_bits = 128,
@@ -1291,7 +1291,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_3DES,
 		.algorithm_mac = SSL_SHA1,
 		.algorithm_ssl = SSL_TLSV1,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+		.algo_strength = SSL_HIGH|SSL_FIPS,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
 		.strength_bits = 112,
 		.alg_bits = 168,
@@ -1307,7 +1307,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_AES128,
 		.algorithm_mac = SSL_SHA1,
 		.algorithm_ssl = SSL_TLSV1,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+		.algo_strength = SSL_HIGH|SSL_FIPS,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
 		.strength_bits = 128,
 		.alg_bits = 128,
@@ -1323,7 +1323,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_AES256,
 		.algorithm_mac = SSL_SHA1,
 		.algorithm_ssl = SSL_TLSV1,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+		.algo_strength = SSL_HIGH|SSL_FIPS,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
 		.strength_bits = 256,
 		.alg_bits = 256,
@@ -1342,7 +1342,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_AES128GCM,
 		.algorithm_mac = SSL_AEAD,
 		.algorithm_ssl = SSL_TLSV1_2,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+		.algo_strength = SSL_HIGH|SSL_FIPS,
 		.algorithm2 = SSL_HANDSHAKE_MAC_SHA256|TLS1_PRF_SHA256|
 		    SSL_CIPHER_ALGORITHM2_AEAD|FIXED_NONCE_LEN(4)|
 		    SSL_CIPHER_ALGORITHM2_VARIABLE_NONCE_IN_RECORD,
@@ -1360,7 +1360,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_AES256GCM,
 		.algorithm_mac = SSL_AEAD,
 		.algorithm_ssl = SSL_TLSV1_2,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+		.algo_strength = SSL_HIGH|SSL_FIPS,
 		.algorithm2 = SSL_HANDSHAKE_MAC_SHA384|TLS1_PRF_SHA384|
 		    SSL_CIPHER_ALGORITHM2_AEAD|FIXED_NONCE_LEN(4)|
 		    SSL_CIPHER_ALGORITHM2_VARIABLE_NONCE_IN_RECORD,
@@ -1378,7 +1378,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_AES128GCM,
 		.algorithm_mac = SSL_AEAD,
 		.algorithm_ssl = SSL_TLSV1_2,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+		.algo_strength = SSL_HIGH|SSL_FIPS,
 		.algorithm2 = SSL_HANDSHAKE_MAC_SHA256|TLS1_PRF_SHA256|
 		    SSL_CIPHER_ALGORITHM2_AEAD|FIXED_NONCE_LEN(4)|
 		    SSL_CIPHER_ALGORITHM2_VARIABLE_NONCE_IN_RECORD,
@@ -1396,7 +1396,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_AES256GCM,
 		.algorithm_mac = SSL_AEAD,
 		.algorithm_ssl = SSL_TLSV1_2,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+		.algo_strength = SSL_HIGH|SSL_FIPS,
 		.algorithm2 = SSL_HANDSHAKE_MAC_SHA384|TLS1_PRF_SHA384|
 		    SSL_CIPHER_ALGORITHM2_AEAD|FIXED_NONCE_LEN(4)|
 		    SSL_CIPHER_ALGORITHM2_VARIABLE_NONCE_IN_RECORD,
@@ -1414,7 +1414,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_AES128GCM,
 		.algorithm_mac = SSL_AEAD,
 		.algorithm_ssl = SSL_TLSV1_2,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+		.algo_strength = SSL_HIGH|SSL_FIPS,
 		.algorithm2 = SSL_HANDSHAKE_MAC_SHA256|TLS1_PRF_SHA256|
 		    SSL_CIPHER_ALGORITHM2_AEAD|FIXED_NONCE_LEN(4)|
 		    SSL_CIPHER_ALGORITHM2_VARIABLE_NONCE_IN_RECORD,
@@ -1432,7 +1432,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_AES256GCM,
 		.algorithm_mac = SSL_AEAD,
 		.algorithm_ssl = SSL_TLSV1_2,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+		.algo_strength = SSL_HIGH|SSL_FIPS,
 		.algorithm2 = SSL_HANDSHAKE_MAC_SHA384|TLS1_PRF_SHA384|
 		    SSL_CIPHER_ALGORITHM2_AEAD|FIXED_NONCE_LEN(4)|
 		    SSL_CIPHER_ALGORITHM2_VARIABLE_NONCE_IN_RECORD,
@@ -1450,7 +1450,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_AES128GCM,
 		.algorithm_mac = SSL_AEAD,
 		.algorithm_ssl = SSL_TLSV1_2,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+		.algo_strength = SSL_HIGH|SSL_FIPS,
 		.algorithm2 = SSL_HANDSHAKE_MAC_SHA256|TLS1_PRF_SHA256|
 		    SSL_CIPHER_ALGORITHM2_AEAD|FIXED_NONCE_LEN(4)|
 		    SSL_CIPHER_ALGORITHM2_VARIABLE_NONCE_IN_RECORD,
@@ -1468,7 +1468,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_AES256GCM,
 		.algorithm_mac = SSL_AEAD,
 		.algorithm_ssl = SSL_TLSV1_2,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+		.algo_strength = SSL_HIGH|SSL_FIPS,
 		.algorithm2 = SSL_HANDSHAKE_MAC_SHA384|TLS1_PRF_SHA384|
 		    SSL_CIPHER_ALGORITHM2_AEAD|FIXED_NONCE_LEN(4)|
 		    SSL_CIPHER_ALGORITHM2_VARIABLE_NONCE_IN_RECORD,
@@ -1486,7 +1486,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_AES128GCM,
 		.algorithm_mac = SSL_AEAD,
 		.algorithm_ssl = SSL_TLSV1_2,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+		.algo_strength = SSL_HIGH|SSL_FIPS,
 		.algorithm2 = SSL_HANDSHAKE_MAC_SHA256|TLS1_PRF_SHA256|
 		    SSL_CIPHER_ALGORITHM2_AEAD|FIXED_NONCE_LEN(4)|
 		    SSL_CIPHER_ALGORITHM2_VARIABLE_NONCE_IN_RECORD,
@@ -1504,7 +1504,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_AES256GCM,
 		.algorithm_mac = SSL_AEAD,
 		.algorithm_ssl = SSL_TLSV1_2,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+		.algo_strength = SSL_HIGH|SSL_FIPS,
 		.algorithm2 = SSL_HANDSHAKE_MAC_SHA384|TLS1_PRF_SHA384|
 		    SSL_CIPHER_ALGORITHM2_AEAD|FIXED_NONCE_LEN(4)|
 		    SSL_CIPHER_ALGORITHM2_VARIABLE_NONCE_IN_RECORD,
@@ -1522,7 +1522,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_AES128GCM,
 		.algorithm_mac = SSL_AEAD,
 		.algorithm_ssl = SSL_TLSV1_2,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+		.algo_strength = SSL_HIGH|SSL_FIPS,
 		.algorithm2 = SSL_HANDSHAKE_MAC_SHA256|TLS1_PRF_SHA256|
 		    SSL_CIPHER_ALGORITHM2_AEAD|FIXED_NONCE_LEN(4)|
 		    SSL_CIPHER_ALGORITHM2_VARIABLE_NONCE_IN_RECORD,
@@ -1540,7 +1540,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_AES256GCM,
 		.algorithm_mac = SSL_AEAD,
 		.algorithm_ssl = SSL_TLSV1_2,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+		.algo_strength = SSL_HIGH|SSL_FIPS,
 		.algorithm2 = SSL_HANDSHAKE_MAC_SHA384|TLS1_PRF_SHA384|
 		    SSL_CIPHER_ALGORITHM2_AEAD|FIXED_NONCE_LEN(4)|
 		    SSL_CIPHER_ALGORITHM2_VARIABLE_NONCE_IN_RECORD,
@@ -1558,7 +1558,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_eNULL,
 		.algorithm_mac = SSL_SHA1,
 		.algorithm_ssl = SSL_TLSV1,
-		.algo_strength = SSL_NOT_EXP|SSL_STRONG_NONE|SSL_FIPS,
+		.algo_strength = SSL_STRONG_NONE|SSL_FIPS,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
 		.strength_bits = 0,
 		.alg_bits = 0,
@@ -1574,7 +1574,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_RC4,
 		.algorithm_mac = SSL_SHA1,
 		.algorithm_ssl = SSL_TLSV1,
-		.algo_strength = SSL_NOT_EXP|SSL_MEDIUM,
+		.algo_strength = SSL_MEDIUM,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
 		.strength_bits = 128,
 		.alg_bits = 128,
@@ -1590,7 +1590,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_3DES,
 		.algorithm_mac = SSL_SHA1,
 		.algorithm_ssl = SSL_TLSV1,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+		.algo_strength = SSL_HIGH|SSL_FIPS,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
 		.strength_bits = 112,
 		.alg_bits = 168,
@@ -1606,7 +1606,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_AES128,
 		.algorithm_mac = SSL_SHA1,
 		.algorithm_ssl = SSL_TLSV1,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+		.algo_strength = SSL_HIGH|SSL_FIPS,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
 		.strength_bits = 128,
 		.alg_bits = 128,
@@ -1622,7 +1622,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_AES256,
 		.algorithm_mac = SSL_SHA1,
 		.algorithm_ssl = SSL_TLSV1,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+		.algo_strength = SSL_HIGH|SSL_FIPS,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
 		.strength_bits = 256,
 		.alg_bits = 256,
@@ -1638,7 +1638,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_eNULL,
 		.algorithm_mac = SSL_SHA1,
 		.algorithm_ssl = SSL_TLSV1,
-		.algo_strength = SSL_NOT_EXP|SSL_STRONG_NONE|SSL_FIPS,
+		.algo_strength = SSL_STRONG_NONE|SSL_FIPS,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
 		.strength_bits = 0,
 		.alg_bits = 0,
@@ -1654,7 +1654,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_RC4,
 		.algorithm_mac = SSL_SHA1,
 		.algorithm_ssl = SSL_TLSV1,
-		.algo_strength = SSL_NOT_EXP|SSL_MEDIUM,
+		.algo_strength = SSL_MEDIUM,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
 		.strength_bits = 128,
 		.alg_bits = 128,
@@ -1670,7 +1670,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_3DES,
 		.algorithm_mac = SSL_SHA1,
 		.algorithm_ssl = SSL_TLSV1,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+		.algo_strength = SSL_HIGH|SSL_FIPS,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
 		.strength_bits = 112,
 		.alg_bits = 168,
@@ -1686,7 +1686,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_AES128,
 		.algorithm_mac = SSL_SHA1,
 		.algorithm_ssl = SSL_TLSV1,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+		.algo_strength = SSL_HIGH|SSL_FIPS,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
 		.strength_bits = 128,
 		.alg_bits = 128,
@@ -1702,7 +1702,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_AES256,
 		.algorithm_mac = SSL_SHA1,
 		.algorithm_ssl = SSL_TLSV1,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+		.algo_strength = SSL_HIGH|SSL_FIPS,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
 		.strength_bits = 256,
 		.alg_bits = 256,
@@ -1718,7 +1718,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_eNULL,
 		.algorithm_mac = SSL_SHA1,
 		.algorithm_ssl = SSL_TLSV1,
-		.algo_strength = SSL_NOT_EXP|SSL_STRONG_NONE|SSL_FIPS,
+		.algo_strength = SSL_STRONG_NONE|SSL_FIPS,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
 		.strength_bits = 0,
 		.alg_bits = 0,
@@ -1734,7 +1734,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_RC4,
 		.algorithm_mac = SSL_SHA1,
 		.algorithm_ssl = SSL_TLSV1,
-		.algo_strength = SSL_NOT_EXP|SSL_MEDIUM,
+		.algo_strength = SSL_MEDIUM,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
 		.strength_bits = 128,
 		.alg_bits = 128,
@@ -1750,7 +1750,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_3DES,
 		.algorithm_mac = SSL_SHA1,
 		.algorithm_ssl = SSL_TLSV1,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+		.algo_strength = SSL_HIGH|SSL_FIPS,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
 		.strength_bits = 112,
 		.alg_bits = 168,
@@ -1766,7 +1766,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_AES128,
 		.algorithm_mac = SSL_SHA1,
 		.algorithm_ssl = SSL_TLSV1,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+		.algo_strength = SSL_HIGH|SSL_FIPS,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
 		.strength_bits = 128,
 		.alg_bits = 128,
@@ -1782,7 +1782,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_AES256,
 		.algorithm_mac = SSL_SHA1,
 		.algorithm_ssl = SSL_TLSV1,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+		.algo_strength = SSL_HIGH|SSL_FIPS,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
 		.strength_bits = 256,
 		.alg_bits = 256,
@@ -1798,7 +1798,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_eNULL,
 		.algorithm_mac = SSL_SHA1,
 		.algorithm_ssl = SSL_TLSV1,
-		.algo_strength = SSL_NOT_EXP|SSL_STRONG_NONE|SSL_FIPS,
+		.algo_strength = SSL_STRONG_NONE|SSL_FIPS,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
 		.strength_bits = 0,
 		.alg_bits = 0,
@@ -1814,7 +1814,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_RC4,
 		.algorithm_mac = SSL_SHA1,
 		.algorithm_ssl = SSL_TLSV1,
-		.algo_strength = SSL_NOT_EXP|SSL_MEDIUM,
+		.algo_strength = SSL_MEDIUM,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
 		.strength_bits = 128,
 		.alg_bits = 128,
@@ -1830,7 +1830,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_3DES,
 		.algorithm_mac = SSL_SHA1,
 		.algorithm_ssl = SSL_TLSV1,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+		.algo_strength = SSL_HIGH|SSL_FIPS,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
 		.strength_bits = 112,
 		.alg_bits = 168,
@@ -1846,7 +1846,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_AES128,
 		.algorithm_mac = SSL_SHA1,
 		.algorithm_ssl = SSL_TLSV1,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+		.algo_strength = SSL_HIGH|SSL_FIPS,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
 		.strength_bits = 128,
 		.alg_bits = 128,
@@ -1862,7 +1862,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_AES256,
 		.algorithm_mac = SSL_SHA1,
 		.algorithm_ssl = SSL_TLSV1,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+		.algo_strength = SSL_HIGH|SSL_FIPS,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
 		.strength_bits = 256,
 		.alg_bits = 256,
@@ -1878,7 +1878,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_eNULL,
 		.algorithm_mac = SSL_SHA1,
 		.algorithm_ssl = SSL_TLSV1,
-		.algo_strength = SSL_NOT_EXP|SSL_STRONG_NONE|SSL_FIPS,
+		.algo_strength = SSL_STRONG_NONE|SSL_FIPS,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
 		.strength_bits = 0,
 		.alg_bits = 0,
@@ -1894,7 +1894,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_RC4,
 		.algorithm_mac = SSL_SHA1,
 		.algorithm_ssl = SSL_TLSV1,
-		.algo_strength = SSL_NOT_EXP|SSL_MEDIUM,
+		.algo_strength = SSL_MEDIUM,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
 		.strength_bits = 128,
 		.alg_bits = 128,
@@ -1910,7 +1910,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_3DES,
 		.algorithm_mac = SSL_SHA1,
 		.algorithm_ssl = SSL_TLSV1,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+		.algo_strength = SSL_HIGH|SSL_FIPS,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
 		.strength_bits = 112,
 		.alg_bits = 168,
@@ -1926,7 +1926,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_AES128,
 		.algorithm_mac = SSL_SHA1,
 		.algorithm_ssl = SSL_TLSV1,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+		.algo_strength = SSL_HIGH|SSL_FIPS,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
 		.strength_bits = 128,
 		.alg_bits = 128,
@@ -1942,7 +1942,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_AES256,
 		.algorithm_mac = SSL_SHA1,
 		.algorithm_ssl = SSL_TLSV1,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+		.algo_strength = SSL_HIGH|SSL_FIPS,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
 		.strength_bits = 256,
 		.alg_bits = 256,
@@ -1961,7 +1961,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_AES128,
 		.algorithm_mac = SSL_SHA256,
 		.algorithm_ssl = SSL_TLSV1_2,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+		.algo_strength = SSL_HIGH|SSL_FIPS,
 		.algorithm2 = SSL_HANDSHAKE_MAC_SHA256|TLS1_PRF_SHA256,
 		.strength_bits = 128,
 		.alg_bits = 128,
@@ -1977,7 +1977,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_AES256,
 		.algorithm_mac = SSL_SHA384,
 		.algorithm_ssl = SSL_TLSV1_2,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+		.algo_strength = SSL_HIGH|SSL_FIPS,
 		.algorithm2 = SSL_HANDSHAKE_MAC_SHA384|TLS1_PRF_SHA384,
 		.strength_bits = 256,
 		.alg_bits = 256,
@@ -1993,7 +1993,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_AES128,
 		.algorithm_mac = SSL_SHA256,
 		.algorithm_ssl = SSL_TLSV1_2,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+		.algo_strength = SSL_HIGH|SSL_FIPS,
 		.algorithm2 = SSL_HANDSHAKE_MAC_SHA256|TLS1_PRF_SHA256,
 		.strength_bits = 128,
 		.alg_bits = 128,
@@ -2009,7 +2009,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_AES256,
 		.algorithm_mac = SSL_SHA384,
 		.algorithm_ssl = SSL_TLSV1_2,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+		.algo_strength = SSL_HIGH|SSL_FIPS,
 		.algorithm2 = SSL_HANDSHAKE_MAC_SHA384|TLS1_PRF_SHA384,
 		.strength_bits = 256,
 		.alg_bits = 256,
@@ -2025,7 +2025,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_AES128,
 		.algorithm_mac = SSL_SHA256,
 		.algorithm_ssl = SSL_TLSV1_2,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+		.algo_strength = SSL_HIGH|SSL_FIPS,
 		.algorithm2 = SSL_HANDSHAKE_MAC_SHA256|TLS1_PRF_SHA256,
 		.strength_bits = 128,
 		.alg_bits = 128,
@@ -2041,7 +2041,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_AES256,
 		.algorithm_mac = SSL_SHA384,
 		.algorithm_ssl = SSL_TLSV1_2,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+		.algo_strength = SSL_HIGH|SSL_FIPS,
 		.algorithm2 = SSL_HANDSHAKE_MAC_SHA384|TLS1_PRF_SHA384,
 		.strength_bits = 256,
 		.alg_bits = 256,
@@ -2057,7 +2057,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_AES128,
 		.algorithm_mac = SSL_SHA256,
 		.algorithm_ssl = SSL_TLSV1_2,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+		.algo_strength = SSL_HIGH|SSL_FIPS,
 		.algorithm2 = SSL_HANDSHAKE_MAC_SHA256|TLS1_PRF_SHA256,
 		.strength_bits = 128,
 		.alg_bits = 128,
@@ -2073,7 +2073,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_AES256,
 		.algorithm_mac = SSL_SHA384,
 		.algorithm_ssl = SSL_TLSV1_2,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+		.algo_strength = SSL_HIGH|SSL_FIPS,
 		.algorithm2 = SSL_HANDSHAKE_MAC_SHA384|TLS1_PRF_SHA384,
 		.strength_bits = 256,
 		.alg_bits = 256,
@@ -2091,7 +2091,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_AES128GCM,
 		.algorithm_mac = SSL_AEAD,
 		.algorithm_ssl = SSL_TLSV1_2,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+		.algo_strength = SSL_HIGH|SSL_FIPS,
 		.algorithm2 = SSL_HANDSHAKE_MAC_SHA256|TLS1_PRF_SHA256|
 		    SSL_CIPHER_ALGORITHM2_AEAD|FIXED_NONCE_LEN(4)|
 		    SSL_CIPHER_ALGORITHM2_VARIABLE_NONCE_IN_RECORD,
@@ -2109,7 +2109,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_AES256GCM,
 		.algorithm_mac = SSL_AEAD,
 		.algorithm_ssl = SSL_TLSV1_2,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+		.algo_strength = SSL_HIGH|SSL_FIPS,
 		.algorithm2 = SSL_HANDSHAKE_MAC_SHA384|TLS1_PRF_SHA384|
 		    SSL_CIPHER_ALGORITHM2_AEAD|FIXED_NONCE_LEN(4)|
 		    SSL_CIPHER_ALGORITHM2_VARIABLE_NONCE_IN_RECORD,
@@ -2127,7 +2127,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_AES128GCM,
 		.algorithm_mac = SSL_AEAD,
 		.algorithm_ssl = SSL_TLSV1_2,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+		.algo_strength = SSL_HIGH|SSL_FIPS,
 		.algorithm2 = SSL_HANDSHAKE_MAC_SHA256|TLS1_PRF_SHA256|
 		    SSL_CIPHER_ALGORITHM2_AEAD|FIXED_NONCE_LEN(4)|
 		    SSL_CIPHER_ALGORITHM2_VARIABLE_NONCE_IN_RECORD,
@@ -2145,7 +2145,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_AES256GCM,
 		.algorithm_mac = SSL_AEAD,
 		.algorithm_ssl = SSL_TLSV1_2,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+		.algo_strength = SSL_HIGH|SSL_FIPS,
 		.algorithm2 = SSL_HANDSHAKE_MAC_SHA384|TLS1_PRF_SHA384|
 		    SSL_CIPHER_ALGORITHM2_AEAD|FIXED_NONCE_LEN(4)|
 		    SSL_CIPHER_ALGORITHM2_VARIABLE_NONCE_IN_RECORD,
@@ -2163,7 +2163,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_AES128GCM,
 		.algorithm_mac = SSL_AEAD,
 		.algorithm_ssl = SSL_TLSV1_2,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+		.algo_strength = SSL_HIGH|SSL_FIPS,
 		.algorithm2 = SSL_HANDSHAKE_MAC_SHA256|TLS1_PRF_SHA256|
 		    SSL_CIPHER_ALGORITHM2_AEAD|FIXED_NONCE_LEN(4)|
 		    SSL_CIPHER_ALGORITHM2_VARIABLE_NONCE_IN_RECORD,
@@ -2181,7 +2181,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_AES256GCM,
 		.algorithm_mac = SSL_AEAD,
 		.algorithm_ssl = SSL_TLSV1_2,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+		.algo_strength = SSL_HIGH|SSL_FIPS,
 		.algorithm2 = SSL_HANDSHAKE_MAC_SHA384|TLS1_PRF_SHA384|
 		    SSL_CIPHER_ALGORITHM2_AEAD|FIXED_NONCE_LEN(4)|
 		    SSL_CIPHER_ALGORITHM2_VARIABLE_NONCE_IN_RECORD,
@@ -2199,7 +2199,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_AES128GCM,
 		.algorithm_mac = SSL_AEAD,
 		.algorithm_ssl = SSL_TLSV1_2,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+		.algo_strength = SSL_HIGH|SSL_FIPS,
 		.algorithm2 = SSL_HANDSHAKE_MAC_SHA256|TLS1_PRF_SHA256|
 		    SSL_CIPHER_ALGORITHM2_AEAD|FIXED_NONCE_LEN(4)|
 		    SSL_CIPHER_ALGORITHM2_VARIABLE_NONCE_IN_RECORD,
@@ -2217,7 +2217,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_AES256GCM,
 		.algorithm_mac = SSL_AEAD,
 		.algorithm_ssl = SSL_TLSV1_2,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+		.algo_strength = SSL_HIGH|SSL_FIPS,
 		.algorithm2 = SSL_HANDSHAKE_MAC_SHA384|TLS1_PRF_SHA384|
 		    SSL_CIPHER_ALGORITHM2_AEAD|FIXED_NONCE_LEN(4)|
 		    SSL_CIPHER_ALGORITHM2_VARIABLE_NONCE_IN_RECORD,
@@ -2236,7 +2236,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_eGOST2814789CNT,
 		.algorithm_mac = SSL_MD5,
 		.algorithm_ssl = SSL_TLSV1,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH,
+		.algo_strength = SSL_HIGH,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
 		.strength_bits = 256,
 		.alg_bits = 256,
@@ -2250,7 +2250,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_eGOST2814789CNT,
 		.algorithm_mac = SSL_GOST94,
 		.algorithm_ssl = SSL_TLSV1,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH,
+		.algo_strength = SSL_HIGH,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
 		.strength_bits = 256,
 		.alg_bits = 256
@@ -2264,7 +2264,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_eGOST2814789CNT,
 		.algorithm_mac = SSL_GOST89MAC,
 		.algorithm_ssl = SSL_TLSV1,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH,
+		.algo_strength = SSL_HIGH,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
 		.strength_bits = 256,
 		.alg_bits = 256
@@ -2278,7 +2278,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_eGOST2814789CNT,
 		.algorithm_mac = SSL_GOST89MAC,
 		.algorithm_ssl = SSL_TLSV1,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH,
+		.algo_strength = SSL_HIGH,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF|
 		    TLS1_STREAM_MAC,
 		.strength_bits = 256,
@@ -2296,7 +2296,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_CHACHA20POLY1305,
 		.algorithm_mac = SSL_AEAD,
 		.algorithm_ssl = SSL_TLSV1_2,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH,
+		.algo_strength = SSL_HIGH,
 		.algorithm2 = SSL_HANDSHAKE_MAC_SHA256|TLS1_PRF_SHA256|
 		    SSL_CIPHER_ALGORITHM2_AEAD|FIXED_NONCE_LEN(0),
 		.strength_bits = 256,
@@ -2312,7 +2312,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_CHACHA20POLY1305,
 		.algorithm_mac = SSL_AEAD,
 		.algorithm_ssl = SSL_TLSV1_2,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH,
+		.algo_strength = SSL_HIGH,
 		.algorithm2 = SSL_HANDSHAKE_MAC_SHA256|TLS1_PRF_SHA256|
 		    SSL_CIPHER_ALGORITHM2_AEAD|FIXED_NONCE_LEN(0),
 		.strength_bits = 256,
@@ -2328,7 +2328,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_CHACHA20POLY1305,
 		.algorithm_mac = SSL_AEAD,
 		.algorithm_ssl = SSL_TLSV1_2,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH,
+		.algo_strength = SSL_HIGH,
 		.algorithm2 = SSL_HANDSHAKE_MAC_SHA256|TLS1_PRF_SHA256|
 		    SSL_CIPHER_ALGORITHM2_AEAD|FIXED_NONCE_LEN(0),
 		.strength_bits = 256,
diff --git a/src/lib/libssl/src/ssl/s3_lib.c b/src/lib/libssl/src/ssl/s3_lib.c
index 1e8eaa99d4..261bd2d4f6 100644
--- a/src/lib/libssl/src/ssl/s3_lib.c
+++ b/src/lib/libssl/src/ssl/s3_lib.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: s3_lib.c,v 1.62 2014/06/21 16:51:48 jsing Exp $ */
+/* $OpenBSD: s3_lib.c,v 1.63 2014/07/08 21:31:54 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -180,7 +180,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_eNULL,
 		.algorithm_mac = SSL_MD5,
 		.algorithm_ssl = SSL_SSLV3,
-		.algo_strength = SSL_NOT_EXP|SSL_STRONG_NONE,
+		.algo_strength = SSL_STRONG_NONE,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
 		.strength_bits = 0,
 		.alg_bits = 0,
@@ -196,7 +196,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_eNULL,
 		.algorithm_mac = SSL_SHA1,
 		.algorithm_ssl = SSL_SSLV3,
-		.algo_strength = SSL_NOT_EXP|SSL_STRONG_NONE|SSL_FIPS,
+		.algo_strength = SSL_STRONG_NONE|SSL_FIPS,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
 		.strength_bits = 0,
 		.alg_bits = 0,
@@ -228,7 +228,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_RC4,
 		.algorithm_mac = SSL_MD5,
 		.algorithm_ssl = SSL_SSLV3,
-		.algo_strength = SSL_NOT_EXP|SSL_MEDIUM,
+		.algo_strength = SSL_MEDIUM,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
 		.strength_bits = 128,
 		.alg_bits = 128,
@@ -244,7 +244,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_RC4,
 		.algorithm_mac = SSL_SHA1,
 		.algorithm_ssl = SSL_SSLV3,
-		.algo_strength = SSL_NOT_EXP|SSL_MEDIUM,
+		.algo_strength = SSL_MEDIUM,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
 		.strength_bits = 128,
 		.alg_bits = 128,
@@ -277,7 +277,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_IDEA,
 		.algorithm_mac = SSL_SHA1,
 		.algorithm_ssl = SSL_SSLV3,
-		.algo_strength = SSL_NOT_EXP|SSL_MEDIUM,
+		.algo_strength = SSL_MEDIUM,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
 		.strength_bits = 128,
 		.alg_bits = 128,
@@ -310,7 +310,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_DES,
 		.algorithm_mac = SSL_SHA1,
 		.algorithm_ssl = SSL_SSLV3,
-		.algo_strength = SSL_NOT_EXP|SSL_LOW,
+		.algo_strength = SSL_LOW,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
 		.strength_bits = 56,
 		.alg_bits = 56,
@@ -326,7 +326,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_3DES,
 		.algorithm_mac = SSL_SHA1,
 		.algorithm_ssl = SSL_SSLV3,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+		.algo_strength = SSL_HIGH|SSL_FIPS,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
 		.strength_bits = 112,
 		.alg_bits = 168,
@@ -359,7 +359,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_DES,
 		.algorithm_mac = SSL_SHA1,
 		.algorithm_ssl = SSL_SSLV3,
-		.algo_strength = SSL_NOT_EXP|SSL_LOW,
+		.algo_strength = SSL_LOW,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
 		.strength_bits = 56,
 		.alg_bits = 56,
@@ -375,7 +375,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_3DES,
 		.algorithm_mac = SSL_SHA1,
 		.algorithm_ssl = SSL_SSLV3,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+		.algo_strength = SSL_HIGH|SSL_FIPS,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
 		.strength_bits = 112,
 		.alg_bits = 168,
@@ -407,7 +407,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_DES,
 		.algorithm_mac = SSL_SHA1,
 		.algorithm_ssl = SSL_SSLV3,
-		.algo_strength = SSL_NOT_EXP|SSL_LOW,
+		.algo_strength = SSL_LOW,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
 		.strength_bits = 56,
 		.alg_bits = 56,
@@ -423,7 +423,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_3DES,
 		.algorithm_mac = SSL_SHA1,
 		.algorithm_ssl = SSL_SSLV3,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+		.algo_strength = SSL_HIGH|SSL_FIPS,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
 		.strength_bits = 112,
 		.alg_bits = 168,
@@ -456,7 +456,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_DES,
 		.algorithm_mac = SSL_SHA1,
 		.algorithm_ssl = SSL_SSLV3,
-		.algo_strength = SSL_NOT_EXP|SSL_LOW,
+		.algo_strength = SSL_LOW,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
 		.strength_bits = 56,
 		.alg_bits = 56,
@@ -472,7 +472,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_3DES,
 		.algorithm_mac = SSL_SHA1,
 		.algorithm_ssl = SSL_SSLV3,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+		.algo_strength = SSL_HIGH|SSL_FIPS,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
 		.strength_bits = 112,
 		.alg_bits = 168,
@@ -504,7 +504,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_DES,
 		.algorithm_mac = SSL_SHA1,
 		.algorithm_ssl = SSL_SSLV3,
-		.algo_strength = SSL_NOT_EXP|SSL_LOW,
+		.algo_strength = SSL_LOW,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
 		.strength_bits = 56,
 		.alg_bits = 56,
@@ -520,7 +520,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_3DES,
 		.algorithm_mac = SSL_SHA1,
 		.algorithm_ssl = SSL_SSLV3,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+		.algo_strength = SSL_HIGH|SSL_FIPS,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
 		.strength_bits = 112,
 		.alg_bits = 168,
@@ -552,7 +552,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_RC4,
 		.algorithm_mac = SSL_MD5,
 		.algorithm_ssl = SSL_SSLV3,
-		.algo_strength = SSL_NOT_EXP|SSL_MEDIUM,
+		.algo_strength = SSL_MEDIUM,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
 		.strength_bits = 128,
 		.alg_bits = 128,
@@ -584,7 +584,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_DES,
 		.algorithm_mac = SSL_SHA1,
 		.algorithm_ssl = SSL_SSLV3,
-		.algo_strength = SSL_NOT_EXP|SSL_LOW,
+		.algo_strength = SSL_LOW,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
 		.strength_bits = 56,
 		.alg_bits = 56,
@@ -600,7 +600,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_3DES,
 		.algorithm_mac = SSL_SHA1,
 		.algorithm_ssl = SSL_SSLV3,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+		.algo_strength = SSL_HIGH|SSL_FIPS,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
 		.strength_bits = 112,
 		.alg_bits = 168,
@@ -617,7 +617,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_AES128,
 		.algorithm_mac = SSL_SHA1,
 		.algorithm_ssl = SSL_TLSV1,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+		.algo_strength = SSL_HIGH|SSL_FIPS,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
 		.strength_bits = 128,
 		.alg_bits = 128,
@@ -632,7 +632,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_AES128,
 		.algorithm_mac = SSL_SHA1,
 		.algorithm_ssl = SSL_TLSV1,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+		.algo_strength = SSL_HIGH|SSL_FIPS,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
 		.strength_bits = 128,
 		.alg_bits = 128,
@@ -647,7 +647,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_AES128,
 		.algorithm_mac = SSL_SHA1,
 		.algorithm_ssl = SSL_TLSV1,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+		.algo_strength = SSL_HIGH|SSL_FIPS,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
 		.strength_bits = 128,
 		.alg_bits = 128,
@@ -662,7 +662,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_AES128,
 		.algorithm_mac = SSL_SHA1,
 		.algorithm_ssl = SSL_TLSV1,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+		.algo_strength = SSL_HIGH|SSL_FIPS,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
 		.strength_bits = 128,
 		.alg_bits = 128,
@@ -677,7 +677,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_AES128,
 		.algorithm_mac = SSL_SHA1,
 		.algorithm_ssl = SSL_TLSV1,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+		.algo_strength = SSL_HIGH|SSL_FIPS,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
 		.strength_bits = 128,
 		.alg_bits = 128,
@@ -692,7 +692,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_AES128,
 		.algorithm_mac = SSL_SHA1,
 		.algorithm_ssl = SSL_TLSV1,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+		.algo_strength = SSL_HIGH|SSL_FIPS,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
 		.strength_bits = 128,
 		.alg_bits = 128,
@@ -708,7 +708,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_AES256,
 		.algorithm_mac = SSL_SHA1,
 		.algorithm_ssl = SSL_TLSV1,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+		.algo_strength = SSL_HIGH|SSL_FIPS,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
 		.strength_bits = 256,
 		.alg_bits = 256,
@@ -723,7 +723,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_AES256,
 		.algorithm_mac = SSL_SHA1,
 		.algorithm_ssl = SSL_TLSV1,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+		.algo_strength = SSL_HIGH|SSL_FIPS,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
 		.strength_bits = 256,
 		.alg_bits = 256,
@@ -739,7 +739,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_AES256,
 		.algorithm_mac = SSL_SHA1,
 		.algorithm_ssl = SSL_TLSV1,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+		.algo_strength = SSL_HIGH|SSL_FIPS,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
 		.strength_bits = 256,
 		.alg_bits = 256,
@@ -755,7 +755,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_AES256,
 		.algorithm_mac = SSL_SHA1,
 		.algorithm_ssl = SSL_TLSV1,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+		.algo_strength = SSL_HIGH|SSL_FIPS,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
 		.strength_bits = 256,
 		.alg_bits = 256,
@@ -771,7 +771,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_AES256,
 		.algorithm_mac = SSL_SHA1,
 		.algorithm_ssl = SSL_TLSV1,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+		.algo_strength = SSL_HIGH|SSL_FIPS,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
 		.strength_bits = 256,
 		.alg_bits = 256,
@@ -787,7 +787,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_AES256,
 		.algorithm_mac = SSL_SHA1,
 		.algorithm_ssl = SSL_TLSV1,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+		.algo_strength = SSL_HIGH|SSL_FIPS,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
 		.strength_bits = 256,
 		.alg_bits = 256,
@@ -804,7 +804,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_eNULL,
 		.algorithm_mac = SSL_SHA256,
 		.algorithm_ssl = SSL_TLSV1_2,
-		.algo_strength = SSL_NOT_EXP|SSL_STRONG_NONE|SSL_FIPS,
+		.algo_strength = SSL_STRONG_NONE|SSL_FIPS,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
 		.strength_bits = 0,
 		.alg_bits = 0,
@@ -820,7 +820,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_AES128,
 		.algorithm_mac = SSL_SHA256,
 		.algorithm_ssl = SSL_TLSV1_2,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+		.algo_strength = SSL_HIGH|SSL_FIPS,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
 		.strength_bits = 128,
 		.alg_bits = 128,
@@ -836,7 +836,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_AES256,
 		.algorithm_mac = SSL_SHA256,
 		.algorithm_ssl = SSL_TLSV1_2,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+		.algo_strength = SSL_HIGH|SSL_FIPS,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
 		.strength_bits = 256,
 		.alg_bits = 256,
@@ -852,7 +852,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_AES128,
 		.algorithm_mac = SSL_SHA256,
 		.algorithm_ssl = SSL_TLSV1_2,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+		.algo_strength = SSL_HIGH|SSL_FIPS,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
 		.strength_bits = 128,
 		.alg_bits = 128,
@@ -868,7 +868,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_AES128,
 		.algorithm_mac = SSL_SHA256,
 		.algorithm_ssl = SSL_TLSV1_2,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+		.algo_strength = SSL_HIGH|SSL_FIPS,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
 		.strength_bits = 128,
 		.alg_bits = 128,
@@ -884,7 +884,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_AES128,
 		.algorithm_mac = SSL_SHA256,
 		.algorithm_ssl = SSL_TLSV1_2,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+		.algo_strength = SSL_HIGH|SSL_FIPS,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
 		.strength_bits = 128,
 		.alg_bits = 128,
@@ -903,7 +903,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_CAMELLIA128,
 		.algorithm_mac = SSL_SHA1,
 		.algorithm_ssl = SSL_TLSV1,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH,
+		.algo_strength = SSL_HIGH,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
 		.strength_bits = 128,
 		.alg_bits = 128,
@@ -919,7 +919,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_CAMELLIA128,
 		.algorithm_mac = SSL_SHA1,
 		.algorithm_ssl = SSL_TLSV1,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH,
+		.algo_strength = SSL_HIGH,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
 		.strength_bits = 128,
 		.alg_bits = 128,
@@ -935,7 +935,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_CAMELLIA128,
 		.algorithm_mac = SSL_SHA1,
 		.algorithm_ssl = SSL_TLSV1,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH,
+		.algo_strength = SSL_HIGH,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
 		.strength_bits = 128,
 		.alg_bits = 128,
@@ -951,7 +951,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_CAMELLIA128,
 		.algorithm_mac = SSL_SHA1,
 		.algorithm_ssl = SSL_TLSV1,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH,
+		.algo_strength = SSL_HIGH,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
 		.strength_bits = 128,
 		.alg_bits = 128,
@@ -967,7 +967,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_CAMELLIA128,
 		.algorithm_mac = SSL_SHA1,
 		.algorithm_ssl = SSL_TLSV1,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH,
+		.algo_strength = SSL_HIGH,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
 		.strength_bits = 128,
 		.alg_bits = 128,
@@ -983,7 +983,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_CAMELLIA128,
 		.algorithm_mac = SSL_SHA1,
 		.algorithm_ssl = SSL_TLSV1,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH,
+		.algo_strength = SSL_HIGH,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
 		.strength_bits = 128,
 		.alg_bits = 128,
@@ -1001,7 +1001,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_AES128,
 		.algorithm_mac = SSL_SHA256,
 		.algorithm_ssl = SSL_TLSV1_2,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+		.algo_strength = SSL_HIGH|SSL_FIPS,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
 		.strength_bits = 128,
 		.alg_bits = 128,
@@ -1017,7 +1017,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_AES256,
 		.algorithm_mac = SSL_SHA256,
 		.algorithm_ssl = SSL_TLSV1_2,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+		.algo_strength = SSL_HIGH|SSL_FIPS,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
 		.strength_bits = 256,
 		.alg_bits = 256,
@@ -1033,7 +1033,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_AES256,
 		.algorithm_mac = SSL_SHA256,
 		.algorithm_ssl = SSL_TLSV1_2,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+		.algo_strength = SSL_HIGH|SSL_FIPS,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
 		.strength_bits = 256,
 		.alg_bits = 256,
@@ -1049,7 +1049,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_AES256,
 		.algorithm_mac = SSL_SHA256,
 		.algorithm_ssl = SSL_TLSV1_2,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+		.algo_strength = SSL_HIGH|SSL_FIPS,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
 		.strength_bits = 256,
 		.alg_bits = 256,
@@ -1065,7 +1065,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_AES256,
 		.algorithm_mac = SSL_SHA256,
 		.algorithm_ssl = SSL_TLSV1_2,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+		.algo_strength = SSL_HIGH|SSL_FIPS,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
 		.strength_bits = 256,
 		.alg_bits = 256,
@@ -1081,7 +1081,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_AES128,
 		.algorithm_mac = SSL_SHA256,
 		.algorithm_ssl = SSL_TLSV1_2,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+		.algo_strength = SSL_HIGH|SSL_FIPS,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
 		.strength_bits = 128,
 		.alg_bits = 128,
@@ -1097,7 +1097,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_AES256,
 		.algorithm_mac = SSL_SHA256,
 		.algorithm_ssl = SSL_TLSV1_2,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+		.algo_strength = SSL_HIGH|SSL_FIPS,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
 		.strength_bits = 256,
 		.alg_bits = 256,
@@ -1114,7 +1114,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_eGOST2814789CNT,
 		.algorithm_mac = SSL_GOST89MAC,
 		.algorithm_ssl = SSL_TLSV1,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH,
+		.algo_strength = SSL_HIGH,
 		.algorithm2 = SSL_HANDSHAKE_MAC_GOST94|TLS1_PRF_GOST94|
 		    TLS1_STREAM_MAC,
 		.strength_bits = 256,
@@ -1129,7 +1129,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_eGOST2814789CNT,
 		.algorithm_mac = SSL_GOST89MAC,
 		.algorithm_ssl = SSL_TLSV1,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH,
+		.algo_strength = SSL_HIGH,
 		.algorithm2 = SSL_HANDSHAKE_MAC_GOST94|TLS1_PRF_GOST94|
 		    TLS1_STREAM_MAC,
 		.strength_bits = 256,
@@ -1144,7 +1144,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_eNULL,
 		.algorithm_mac = SSL_GOST94,
 		.algorithm_ssl = SSL_TLSV1,
-		.algo_strength = SSL_NOT_EXP|SSL_STRONG_NONE,
+		.algo_strength = SSL_STRONG_NONE,
 		.algorithm2 = SSL_HANDSHAKE_MAC_GOST94|TLS1_PRF_GOST94,
 		.strength_bits = 0,
 		.alg_bits = 0
@@ -1158,7 +1158,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_eNULL,
 		.algorithm_mac = SSL_GOST94,
 		.algorithm_ssl = SSL_TLSV1,
-		.algo_strength = SSL_NOT_EXP|SSL_STRONG_NONE,
+		.algo_strength = SSL_STRONG_NONE,
 		.algorithm2 = SSL_HANDSHAKE_MAC_GOST94|TLS1_PRF_GOST94,
 		.strength_bits = 0,
 		.alg_bits = 0
@@ -1177,7 +1177,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_CAMELLIA256,
 		.algorithm_mac = SSL_SHA1,
 		.algorithm_ssl = SSL_TLSV1,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH,
+		.algo_strength = SSL_HIGH,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
 		.strength_bits = 256,
 		.alg_bits = 256,
@@ -1193,7 +1193,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_CAMELLIA256,
 		.algorithm_mac = SSL_SHA1,
 		.algorithm_ssl = SSL_TLSV1,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH,
+		.algo_strength = SSL_HIGH,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
 		.strength_bits = 256,
 		.alg_bits = 256,
@@ -1209,7 +1209,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_CAMELLIA256,
 		.algorithm_mac = SSL_SHA1,
 		.algorithm_ssl = SSL_TLSV1,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH,
+		.algo_strength = SSL_HIGH,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
 		.strength_bits = 256,
 		.alg_bits = 256,
@@ -1225,7 +1225,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_CAMELLIA256,
 		.algorithm_mac = SSL_SHA1,
 		.algorithm_ssl = SSL_TLSV1,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH,
+		.algo_strength = SSL_HIGH,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
 		.strength_bits = 256,
 		.alg_bits = 256,
@@ -1241,7 +1241,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_CAMELLIA256,
 		.algorithm_mac = SSL_SHA1,
 		.algorithm_ssl = SSL_TLSV1,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH,
+		.algo_strength = SSL_HIGH,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
 		.strength_bits = 256,
 		.alg_bits = 256,
@@ -1257,7 +1257,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_CAMELLIA256,
 		.algorithm_mac = SSL_SHA1,
 		.algorithm_ssl = SSL_TLSV1,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH,
+		.algo_strength = SSL_HIGH,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
 		.strength_bits = 256,
 		.alg_bits = 256,
@@ -1275,7 +1275,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_RC4,
 		.algorithm_mac = SSL_SHA1,
 		.algorithm_ssl = SSL_TLSV1,
-		.algo_strength = SSL_NOT_EXP|SSL_MEDIUM,
+		.algo_strength = SSL_MEDIUM,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
 		.strength_bits = 128,
 		.alg_bits = 128,
@@ -1291,7 +1291,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_3DES,
 		.algorithm_mac = SSL_SHA1,
 		.algorithm_ssl = SSL_TLSV1,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+		.algo_strength = SSL_HIGH|SSL_FIPS,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
 		.strength_bits = 112,
 		.alg_bits = 168,
@@ -1307,7 +1307,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_AES128,
 		.algorithm_mac = SSL_SHA1,
 		.algorithm_ssl = SSL_TLSV1,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+		.algo_strength = SSL_HIGH|SSL_FIPS,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
 		.strength_bits = 128,
 		.alg_bits = 128,
@@ -1323,7 +1323,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_AES256,
 		.algorithm_mac = SSL_SHA1,
 		.algorithm_ssl = SSL_TLSV1,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+		.algo_strength = SSL_HIGH|SSL_FIPS,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
 		.strength_bits = 256,
 		.alg_bits = 256,
@@ -1342,7 +1342,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_AES128GCM,
 		.algorithm_mac = SSL_AEAD,
 		.algorithm_ssl = SSL_TLSV1_2,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+		.algo_strength = SSL_HIGH|SSL_FIPS,
 		.algorithm2 = SSL_HANDSHAKE_MAC_SHA256|TLS1_PRF_SHA256|
 		    SSL_CIPHER_ALGORITHM2_AEAD|FIXED_NONCE_LEN(4)|
 		    SSL_CIPHER_ALGORITHM2_VARIABLE_NONCE_IN_RECORD,
@@ -1360,7 +1360,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_AES256GCM,
 		.algorithm_mac = SSL_AEAD,
 		.algorithm_ssl = SSL_TLSV1_2,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+		.algo_strength = SSL_HIGH|SSL_FIPS,
 		.algorithm2 = SSL_HANDSHAKE_MAC_SHA384|TLS1_PRF_SHA384|
 		    SSL_CIPHER_ALGORITHM2_AEAD|FIXED_NONCE_LEN(4)|
 		    SSL_CIPHER_ALGORITHM2_VARIABLE_NONCE_IN_RECORD,
@@ -1378,7 +1378,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_AES128GCM,
 		.algorithm_mac = SSL_AEAD,
 		.algorithm_ssl = SSL_TLSV1_2,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+		.algo_strength = SSL_HIGH|SSL_FIPS,
 		.algorithm2 = SSL_HANDSHAKE_MAC_SHA256|TLS1_PRF_SHA256|
 		    SSL_CIPHER_ALGORITHM2_AEAD|FIXED_NONCE_LEN(4)|
 		    SSL_CIPHER_ALGORITHM2_VARIABLE_NONCE_IN_RECORD,
@@ -1396,7 +1396,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_AES256GCM,
 		.algorithm_mac = SSL_AEAD,
 		.algorithm_ssl = SSL_TLSV1_2,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+		.algo_strength = SSL_HIGH|SSL_FIPS,
 		.algorithm2 = SSL_HANDSHAKE_MAC_SHA384|TLS1_PRF_SHA384|
 		    SSL_CIPHER_ALGORITHM2_AEAD|FIXED_NONCE_LEN(4)|
 		    SSL_CIPHER_ALGORITHM2_VARIABLE_NONCE_IN_RECORD,
@@ -1414,7 +1414,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_AES128GCM,
 		.algorithm_mac = SSL_AEAD,
 		.algorithm_ssl = SSL_TLSV1_2,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+		.algo_strength = SSL_HIGH|SSL_FIPS,
 		.algorithm2 = SSL_HANDSHAKE_MAC_SHA256|TLS1_PRF_SHA256|
 		    SSL_CIPHER_ALGORITHM2_AEAD|FIXED_NONCE_LEN(4)|
 		    SSL_CIPHER_ALGORITHM2_VARIABLE_NONCE_IN_RECORD,
@@ -1432,7 +1432,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_AES256GCM,
 		.algorithm_mac = SSL_AEAD,
 		.algorithm_ssl = SSL_TLSV1_2,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+		.algo_strength = SSL_HIGH|SSL_FIPS,
 		.algorithm2 = SSL_HANDSHAKE_MAC_SHA384|TLS1_PRF_SHA384|
 		    SSL_CIPHER_ALGORITHM2_AEAD|FIXED_NONCE_LEN(4)|
 		    SSL_CIPHER_ALGORITHM2_VARIABLE_NONCE_IN_RECORD,
@@ -1450,7 +1450,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_AES128GCM,
 		.algorithm_mac = SSL_AEAD,
 		.algorithm_ssl = SSL_TLSV1_2,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+		.algo_strength = SSL_HIGH|SSL_FIPS,
 		.algorithm2 = SSL_HANDSHAKE_MAC_SHA256|TLS1_PRF_SHA256|
 		    SSL_CIPHER_ALGORITHM2_AEAD|FIXED_NONCE_LEN(4)|
 		    SSL_CIPHER_ALGORITHM2_VARIABLE_NONCE_IN_RECORD,
@@ -1468,7 +1468,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_AES256GCM,
 		.algorithm_mac = SSL_AEAD,
 		.algorithm_ssl = SSL_TLSV1_2,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+		.algo_strength = SSL_HIGH|SSL_FIPS,
 		.algorithm2 = SSL_HANDSHAKE_MAC_SHA384|TLS1_PRF_SHA384|
 		    SSL_CIPHER_ALGORITHM2_AEAD|FIXED_NONCE_LEN(4)|
 		    SSL_CIPHER_ALGORITHM2_VARIABLE_NONCE_IN_RECORD,
@@ -1486,7 +1486,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_AES128GCM,
 		.algorithm_mac = SSL_AEAD,
 		.algorithm_ssl = SSL_TLSV1_2,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+		.algo_strength = SSL_HIGH|SSL_FIPS,
 		.algorithm2 = SSL_HANDSHAKE_MAC_SHA256|TLS1_PRF_SHA256|
 		    SSL_CIPHER_ALGORITHM2_AEAD|FIXED_NONCE_LEN(4)|
 		    SSL_CIPHER_ALGORITHM2_VARIABLE_NONCE_IN_RECORD,
@@ -1504,7 +1504,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_AES256GCM,
 		.algorithm_mac = SSL_AEAD,
 		.algorithm_ssl = SSL_TLSV1_2,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+		.algo_strength = SSL_HIGH|SSL_FIPS,
 		.algorithm2 = SSL_HANDSHAKE_MAC_SHA384|TLS1_PRF_SHA384|
 		    SSL_CIPHER_ALGORITHM2_AEAD|FIXED_NONCE_LEN(4)|
 		    SSL_CIPHER_ALGORITHM2_VARIABLE_NONCE_IN_RECORD,
@@ -1522,7 +1522,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_AES128GCM,
 		.algorithm_mac = SSL_AEAD,
 		.algorithm_ssl = SSL_TLSV1_2,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+		.algo_strength = SSL_HIGH|SSL_FIPS,
 		.algorithm2 = SSL_HANDSHAKE_MAC_SHA256|TLS1_PRF_SHA256|
 		    SSL_CIPHER_ALGORITHM2_AEAD|FIXED_NONCE_LEN(4)|
 		    SSL_CIPHER_ALGORITHM2_VARIABLE_NONCE_IN_RECORD,
@@ -1540,7 +1540,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_AES256GCM,
 		.algorithm_mac = SSL_AEAD,
 		.algorithm_ssl = SSL_TLSV1_2,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+		.algo_strength = SSL_HIGH|SSL_FIPS,
 		.algorithm2 = SSL_HANDSHAKE_MAC_SHA384|TLS1_PRF_SHA384|
 		    SSL_CIPHER_ALGORITHM2_AEAD|FIXED_NONCE_LEN(4)|
 		    SSL_CIPHER_ALGORITHM2_VARIABLE_NONCE_IN_RECORD,
@@ -1558,7 +1558,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_eNULL,
 		.algorithm_mac = SSL_SHA1,
 		.algorithm_ssl = SSL_TLSV1,
-		.algo_strength = SSL_NOT_EXP|SSL_STRONG_NONE|SSL_FIPS,
+		.algo_strength = SSL_STRONG_NONE|SSL_FIPS,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
 		.strength_bits = 0,
 		.alg_bits = 0,
@@ -1574,7 +1574,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_RC4,
 		.algorithm_mac = SSL_SHA1,
 		.algorithm_ssl = SSL_TLSV1,
-		.algo_strength = SSL_NOT_EXP|SSL_MEDIUM,
+		.algo_strength = SSL_MEDIUM,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
 		.strength_bits = 128,
 		.alg_bits = 128,
@@ -1590,7 +1590,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_3DES,
 		.algorithm_mac = SSL_SHA1,
 		.algorithm_ssl = SSL_TLSV1,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+		.algo_strength = SSL_HIGH|SSL_FIPS,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
 		.strength_bits = 112,
 		.alg_bits = 168,
@@ -1606,7 +1606,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_AES128,
 		.algorithm_mac = SSL_SHA1,
 		.algorithm_ssl = SSL_TLSV1,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+		.algo_strength = SSL_HIGH|SSL_FIPS,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
 		.strength_bits = 128,
 		.alg_bits = 128,
@@ -1622,7 +1622,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_AES256,
 		.algorithm_mac = SSL_SHA1,
 		.algorithm_ssl = SSL_TLSV1,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+		.algo_strength = SSL_HIGH|SSL_FIPS,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
 		.strength_bits = 256,
 		.alg_bits = 256,
@@ -1638,7 +1638,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_eNULL,
 		.algorithm_mac = SSL_SHA1,
 		.algorithm_ssl = SSL_TLSV1,
-		.algo_strength = SSL_NOT_EXP|SSL_STRONG_NONE|SSL_FIPS,
+		.algo_strength = SSL_STRONG_NONE|SSL_FIPS,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
 		.strength_bits = 0,
 		.alg_bits = 0,
@@ -1654,7 +1654,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_RC4,
 		.algorithm_mac = SSL_SHA1,
 		.algorithm_ssl = SSL_TLSV1,
-		.algo_strength = SSL_NOT_EXP|SSL_MEDIUM,
+		.algo_strength = SSL_MEDIUM,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
 		.strength_bits = 128,
 		.alg_bits = 128,
@@ -1670,7 +1670,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_3DES,
 		.algorithm_mac = SSL_SHA1,
 		.algorithm_ssl = SSL_TLSV1,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+		.algo_strength = SSL_HIGH|SSL_FIPS,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
 		.strength_bits = 112,
 		.alg_bits = 168,
@@ -1686,7 +1686,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_AES128,
 		.algorithm_mac = SSL_SHA1,
 		.algorithm_ssl = SSL_TLSV1,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+		.algo_strength = SSL_HIGH|SSL_FIPS,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
 		.strength_bits = 128,
 		.alg_bits = 128,
@@ -1702,7 +1702,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_AES256,
 		.algorithm_mac = SSL_SHA1,
 		.algorithm_ssl = SSL_TLSV1,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+		.algo_strength = SSL_HIGH|SSL_FIPS,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
 		.strength_bits = 256,
 		.alg_bits = 256,
@@ -1718,7 +1718,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_eNULL,
 		.algorithm_mac = SSL_SHA1,
 		.algorithm_ssl = SSL_TLSV1,
-		.algo_strength = SSL_NOT_EXP|SSL_STRONG_NONE|SSL_FIPS,
+		.algo_strength = SSL_STRONG_NONE|SSL_FIPS,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
 		.strength_bits = 0,
 		.alg_bits = 0,
@@ -1734,7 +1734,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_RC4,
 		.algorithm_mac = SSL_SHA1,
 		.algorithm_ssl = SSL_TLSV1,
-		.algo_strength = SSL_NOT_EXP|SSL_MEDIUM,
+		.algo_strength = SSL_MEDIUM,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
 		.strength_bits = 128,
 		.alg_bits = 128,
@@ -1750,7 +1750,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_3DES,
 		.algorithm_mac = SSL_SHA1,
 		.algorithm_ssl = SSL_TLSV1,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+		.algo_strength = SSL_HIGH|SSL_FIPS,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
 		.strength_bits = 112,
 		.alg_bits = 168,
@@ -1766,7 +1766,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_AES128,
 		.algorithm_mac = SSL_SHA1,
 		.algorithm_ssl = SSL_TLSV1,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+		.algo_strength = SSL_HIGH|SSL_FIPS,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
 		.strength_bits = 128,
 		.alg_bits = 128,
@@ -1782,7 +1782,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_AES256,
 		.algorithm_mac = SSL_SHA1,
 		.algorithm_ssl = SSL_TLSV1,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+		.algo_strength = SSL_HIGH|SSL_FIPS,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
 		.strength_bits = 256,
 		.alg_bits = 256,
@@ -1798,7 +1798,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_eNULL,
 		.algorithm_mac = SSL_SHA1,
 		.algorithm_ssl = SSL_TLSV1,
-		.algo_strength = SSL_NOT_EXP|SSL_STRONG_NONE|SSL_FIPS,
+		.algo_strength = SSL_STRONG_NONE|SSL_FIPS,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
 		.strength_bits = 0,
 		.alg_bits = 0,
@@ -1814,7 +1814,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_RC4,
 		.algorithm_mac = SSL_SHA1,
 		.algorithm_ssl = SSL_TLSV1,
-		.algo_strength = SSL_NOT_EXP|SSL_MEDIUM,
+		.algo_strength = SSL_MEDIUM,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
 		.strength_bits = 128,
 		.alg_bits = 128,
@@ -1830,7 +1830,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_3DES,
 		.algorithm_mac = SSL_SHA1,
 		.algorithm_ssl = SSL_TLSV1,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+		.algo_strength = SSL_HIGH|SSL_FIPS,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
 		.strength_bits = 112,
 		.alg_bits = 168,
@@ -1846,7 +1846,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_AES128,
 		.algorithm_mac = SSL_SHA1,
 		.algorithm_ssl = SSL_TLSV1,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+		.algo_strength = SSL_HIGH|SSL_FIPS,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
 		.strength_bits = 128,
 		.alg_bits = 128,
@@ -1862,7 +1862,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_AES256,
 		.algorithm_mac = SSL_SHA1,
 		.algorithm_ssl = SSL_TLSV1,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+		.algo_strength = SSL_HIGH|SSL_FIPS,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
 		.strength_bits = 256,
 		.alg_bits = 256,
@@ -1878,7 +1878,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_eNULL,
 		.algorithm_mac = SSL_SHA1,
 		.algorithm_ssl = SSL_TLSV1,
-		.algo_strength = SSL_NOT_EXP|SSL_STRONG_NONE|SSL_FIPS,
+		.algo_strength = SSL_STRONG_NONE|SSL_FIPS,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
 		.strength_bits = 0,
 		.alg_bits = 0,
@@ -1894,7 +1894,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_RC4,
 		.algorithm_mac = SSL_SHA1,
 		.algorithm_ssl = SSL_TLSV1,
-		.algo_strength = SSL_NOT_EXP|SSL_MEDIUM,
+		.algo_strength = SSL_MEDIUM,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
 		.strength_bits = 128,
 		.alg_bits = 128,
@@ -1910,7 +1910,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_3DES,
 		.algorithm_mac = SSL_SHA1,
 		.algorithm_ssl = SSL_TLSV1,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+		.algo_strength = SSL_HIGH|SSL_FIPS,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
 		.strength_bits = 112,
 		.alg_bits = 168,
@@ -1926,7 +1926,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_AES128,
 		.algorithm_mac = SSL_SHA1,
 		.algorithm_ssl = SSL_TLSV1,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+		.algo_strength = SSL_HIGH|SSL_FIPS,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
 		.strength_bits = 128,
 		.alg_bits = 128,
@@ -1942,7 +1942,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_AES256,
 		.algorithm_mac = SSL_SHA1,
 		.algorithm_ssl = SSL_TLSV1,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+		.algo_strength = SSL_HIGH|SSL_FIPS,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
 		.strength_bits = 256,
 		.alg_bits = 256,
@@ -1961,7 +1961,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_AES128,
 		.algorithm_mac = SSL_SHA256,
 		.algorithm_ssl = SSL_TLSV1_2,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+		.algo_strength = SSL_HIGH|SSL_FIPS,
 		.algorithm2 = SSL_HANDSHAKE_MAC_SHA256|TLS1_PRF_SHA256,
 		.strength_bits = 128,
 		.alg_bits = 128,
@@ -1977,7 +1977,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_AES256,
 		.algorithm_mac = SSL_SHA384,
 		.algorithm_ssl = SSL_TLSV1_2,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+		.algo_strength = SSL_HIGH|SSL_FIPS,
 		.algorithm2 = SSL_HANDSHAKE_MAC_SHA384|TLS1_PRF_SHA384,
 		.strength_bits = 256,
 		.alg_bits = 256,
@@ -1993,7 +1993,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_AES128,
 		.algorithm_mac = SSL_SHA256,
 		.algorithm_ssl = SSL_TLSV1_2,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+		.algo_strength = SSL_HIGH|SSL_FIPS,
 		.algorithm2 = SSL_HANDSHAKE_MAC_SHA256|TLS1_PRF_SHA256,
 		.strength_bits = 128,
 		.alg_bits = 128,
@@ -2009,7 +2009,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_AES256,
 		.algorithm_mac = SSL_SHA384,
 		.algorithm_ssl = SSL_TLSV1_2,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+		.algo_strength = SSL_HIGH|SSL_FIPS,
 		.algorithm2 = SSL_HANDSHAKE_MAC_SHA384|TLS1_PRF_SHA384,
 		.strength_bits = 256,
 		.alg_bits = 256,
@@ -2025,7 +2025,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_AES128,
 		.algorithm_mac = SSL_SHA256,
 		.algorithm_ssl = SSL_TLSV1_2,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+		.algo_strength = SSL_HIGH|SSL_FIPS,
 		.algorithm2 = SSL_HANDSHAKE_MAC_SHA256|TLS1_PRF_SHA256,
 		.strength_bits = 128,
 		.alg_bits = 128,
@@ -2041,7 +2041,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_AES256,
 		.algorithm_mac = SSL_SHA384,
 		.algorithm_ssl = SSL_TLSV1_2,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+		.algo_strength = SSL_HIGH|SSL_FIPS,
 		.algorithm2 = SSL_HANDSHAKE_MAC_SHA384|TLS1_PRF_SHA384,
 		.strength_bits = 256,
 		.alg_bits = 256,
@@ -2057,7 +2057,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_AES128,
 		.algorithm_mac = SSL_SHA256,
 		.algorithm_ssl = SSL_TLSV1_2,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+		.algo_strength = SSL_HIGH|SSL_FIPS,
 		.algorithm2 = SSL_HANDSHAKE_MAC_SHA256|TLS1_PRF_SHA256,
 		.strength_bits = 128,
 		.alg_bits = 128,
@@ -2073,7 +2073,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_AES256,
 		.algorithm_mac = SSL_SHA384,
 		.algorithm_ssl = SSL_TLSV1_2,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+		.algo_strength = SSL_HIGH|SSL_FIPS,
 		.algorithm2 = SSL_HANDSHAKE_MAC_SHA384|TLS1_PRF_SHA384,
 		.strength_bits = 256,
 		.alg_bits = 256,
@@ -2091,7 +2091,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_AES128GCM,
 		.algorithm_mac = SSL_AEAD,
 		.algorithm_ssl = SSL_TLSV1_2,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+		.algo_strength = SSL_HIGH|SSL_FIPS,
 		.algorithm2 = SSL_HANDSHAKE_MAC_SHA256|TLS1_PRF_SHA256|
 		    SSL_CIPHER_ALGORITHM2_AEAD|FIXED_NONCE_LEN(4)|
 		    SSL_CIPHER_ALGORITHM2_VARIABLE_NONCE_IN_RECORD,
@@ -2109,7 +2109,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_AES256GCM,
 		.algorithm_mac = SSL_AEAD,
 		.algorithm_ssl = SSL_TLSV1_2,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+		.algo_strength = SSL_HIGH|SSL_FIPS,
 		.algorithm2 = SSL_HANDSHAKE_MAC_SHA384|TLS1_PRF_SHA384|
 		    SSL_CIPHER_ALGORITHM2_AEAD|FIXED_NONCE_LEN(4)|
 		    SSL_CIPHER_ALGORITHM2_VARIABLE_NONCE_IN_RECORD,
@@ -2127,7 +2127,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_AES128GCM,
 		.algorithm_mac = SSL_AEAD,
 		.algorithm_ssl = SSL_TLSV1_2,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+		.algo_strength = SSL_HIGH|SSL_FIPS,
 		.algorithm2 = SSL_HANDSHAKE_MAC_SHA256|TLS1_PRF_SHA256|
 		    SSL_CIPHER_ALGORITHM2_AEAD|FIXED_NONCE_LEN(4)|
 		    SSL_CIPHER_ALGORITHM2_VARIABLE_NONCE_IN_RECORD,
@@ -2145,7 +2145,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_AES256GCM,
 		.algorithm_mac = SSL_AEAD,
 		.algorithm_ssl = SSL_TLSV1_2,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+		.algo_strength = SSL_HIGH|SSL_FIPS,
 		.algorithm2 = SSL_HANDSHAKE_MAC_SHA384|TLS1_PRF_SHA384|
 		    SSL_CIPHER_ALGORITHM2_AEAD|FIXED_NONCE_LEN(4)|
 		    SSL_CIPHER_ALGORITHM2_VARIABLE_NONCE_IN_RECORD,
@@ -2163,7 +2163,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_AES128GCM,
 		.algorithm_mac = SSL_AEAD,
 		.algorithm_ssl = SSL_TLSV1_2,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+		.algo_strength = SSL_HIGH|SSL_FIPS,
 		.algorithm2 = SSL_HANDSHAKE_MAC_SHA256|TLS1_PRF_SHA256|
 		    SSL_CIPHER_ALGORITHM2_AEAD|FIXED_NONCE_LEN(4)|
 		    SSL_CIPHER_ALGORITHM2_VARIABLE_NONCE_IN_RECORD,
@@ -2181,7 +2181,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_AES256GCM,
 		.algorithm_mac = SSL_AEAD,
 		.algorithm_ssl = SSL_TLSV1_2,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+		.algo_strength = SSL_HIGH|SSL_FIPS,
 		.algorithm2 = SSL_HANDSHAKE_MAC_SHA384|TLS1_PRF_SHA384|
 		    SSL_CIPHER_ALGORITHM2_AEAD|FIXED_NONCE_LEN(4)|
 		    SSL_CIPHER_ALGORITHM2_VARIABLE_NONCE_IN_RECORD,
@@ -2199,7 +2199,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_AES128GCM,
 		.algorithm_mac = SSL_AEAD,
 		.algorithm_ssl = SSL_TLSV1_2,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+		.algo_strength = SSL_HIGH|SSL_FIPS,
 		.algorithm2 = SSL_HANDSHAKE_MAC_SHA256|TLS1_PRF_SHA256|
 		    SSL_CIPHER_ALGORITHM2_AEAD|FIXED_NONCE_LEN(4)|
 		    SSL_CIPHER_ALGORITHM2_VARIABLE_NONCE_IN_RECORD,
@@ -2217,7 +2217,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_AES256GCM,
 		.algorithm_mac = SSL_AEAD,
 		.algorithm_ssl = SSL_TLSV1_2,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+		.algo_strength = SSL_HIGH|SSL_FIPS,
 		.algorithm2 = SSL_HANDSHAKE_MAC_SHA384|TLS1_PRF_SHA384|
 		    SSL_CIPHER_ALGORITHM2_AEAD|FIXED_NONCE_LEN(4)|
 		    SSL_CIPHER_ALGORITHM2_VARIABLE_NONCE_IN_RECORD,
@@ -2236,7 +2236,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_eGOST2814789CNT,
 		.algorithm_mac = SSL_MD5,
 		.algorithm_ssl = SSL_TLSV1,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH,
+		.algo_strength = SSL_HIGH,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
 		.strength_bits = 256,
 		.alg_bits = 256,
@@ -2250,7 +2250,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_eGOST2814789CNT,
 		.algorithm_mac = SSL_GOST94,
 		.algorithm_ssl = SSL_TLSV1,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH,
+		.algo_strength = SSL_HIGH,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
 		.strength_bits = 256,
 		.alg_bits = 256
@@ -2264,7 +2264,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_eGOST2814789CNT,
 		.algorithm_mac = SSL_GOST89MAC,
 		.algorithm_ssl = SSL_TLSV1,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH,
+		.algo_strength = SSL_HIGH,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
 		.strength_bits = 256,
 		.alg_bits = 256
@@ -2278,7 +2278,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_eGOST2814789CNT,
 		.algorithm_mac = SSL_GOST89MAC,
 		.algorithm_ssl = SSL_TLSV1,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH,
+		.algo_strength = SSL_HIGH,
 		.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF|
 		    TLS1_STREAM_MAC,
 		.strength_bits = 256,
@@ -2296,7 +2296,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_CHACHA20POLY1305,
 		.algorithm_mac = SSL_AEAD,
 		.algorithm_ssl = SSL_TLSV1_2,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH,
+		.algo_strength = SSL_HIGH,
 		.algorithm2 = SSL_HANDSHAKE_MAC_SHA256|TLS1_PRF_SHA256|
 		    SSL_CIPHER_ALGORITHM2_AEAD|FIXED_NONCE_LEN(0),
 		.strength_bits = 256,
@@ -2312,7 +2312,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_CHACHA20POLY1305,
 		.algorithm_mac = SSL_AEAD,
 		.algorithm_ssl = SSL_TLSV1_2,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH,
+		.algo_strength = SSL_HIGH,
 		.algorithm2 = SSL_HANDSHAKE_MAC_SHA256|TLS1_PRF_SHA256|
 		    SSL_CIPHER_ALGORITHM2_AEAD|FIXED_NONCE_LEN(0),
 		.strength_bits = 256,
@@ -2328,7 +2328,7 @@ SSL_CIPHER ssl3_ciphers[] = {
 		.algorithm_enc = SSL_CHACHA20POLY1305,
 		.algorithm_mac = SSL_AEAD,
 		.algorithm_ssl = SSL_TLSV1_2,
-		.algo_strength = SSL_NOT_EXP|SSL_HIGH,
+		.algo_strength = SSL_HIGH,
 		.algorithm2 = SSL_HANDSHAKE_MAC_SHA256|TLS1_PRF_SHA256|
 		    SSL_CIPHER_ALGORITHM2_AEAD|FIXED_NONCE_LEN(0),
 		.strength_bits = 256,
diff --git a/src/lib/libssl/src/ssl/ssl_locl.h b/src/lib/libssl/src/ssl/ssl_locl.h
index 09d4b20334..0b2551be20 100644
--- a/src/lib/libssl/src/ssl/ssl_locl.h
+++ b/src/lib/libssl/src/ssl/ssl_locl.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssl_locl.h,v 1.53 2014/06/21 17:02:25 jsing Exp $ */
+/* $OpenBSD: ssl_locl.h,v 1.54 2014/07/08 21:31:54 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -385,7 +385,6 @@
 #define SSL_EXP_MASK		0x00000003L
 #define SSL_STRONG_MASK		0x000001fcL
 
-#define SSL_NOT_EXP		0x00000001L
 #define SSL_EXPORT		0x00000002L
 
 #define SSL_STRONG_NONE		0x00000004L
diff --git a/src/lib/libssl/ssl_locl.h b/src/lib/libssl/ssl_locl.h
index 09d4b20334..0b2551be20 100644
--- a/src/lib/libssl/ssl_locl.h
+++ b/src/lib/libssl/ssl_locl.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssl_locl.h,v 1.53 2014/06/21 17:02:25 jsing Exp $ */
+/* $OpenBSD: ssl_locl.h,v 1.54 2014/07/08 21:31:54 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -385,7 +385,6 @@
 #define SSL_EXP_MASK		0x00000003L
 #define SSL_STRONG_MASK		0x000001fcL
 
-#define SSL_NOT_EXP		0x00000001L
 #define SSL_EXPORT		0x00000002L
 
 #define SSL_STRONG_NONE		0x00000004L
-- 
cgit v1.2.3-55-g6feb