diff options
| author | Joel Sing <jsing@cvs.openbsd.org> | 2014-07-08 21:50:41 +0000 |
|---|---|---|
| committer | Joel Sing <jsing@cvs.openbsd.org> | 2014-07-08 21:50:41 +0000 |
| commit | 2260cd5e572be036512aa9bf2c18fed97dfaaa6f (patch) | |
| tree | 12be2aa3e078c389c542e73076c971743bc82213 /lib/libssl/s3_lib.c | |
| parent | 2386b715bd50434c9e3e1a2e8ebe45fc3d68a99d (diff) | |
Remove SSL_FIPS.
ok deraadt@ miod@
Diffstat (limited to 'lib/libssl/s3_lib.c')
| -rw-r--r-- | lib/libssl/s3_lib.c | 168 |
1 files changed, 84 insertions, 84 deletions
diff --git a/lib/libssl/s3_lib.c b/lib/libssl/s3_lib.c index 261bd2d4f69..e1c18bd10de 100644 --- a/lib/libssl/s3_lib.c +++ b/lib/libssl/s3_lib.c @@ -1,4 +1,4 @@ -/* $OpenBSD: s3_lib.c,v 1.63 2014/07/08 21:31:54 jsing Exp $ */ +/* $OpenBSD: s3_lib.c,v 1.64 2014/07/08 21:50:40 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -196,7 +196,7 @@ SSL_CIPHER ssl3_ciphers[] = { .algorithm_enc = SSL_eNULL, .algorithm_mac = SSL_SHA1, .algorithm_ssl = SSL_SSLV3, - .algo_strength = SSL_STRONG_NONE|SSL_FIPS, + .algo_strength = SSL_STRONG_NONE, .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, .strength_bits = 0, .alg_bits = 0, @@ -326,7 +326,7 @@ SSL_CIPHER ssl3_ciphers[] = { .algorithm_enc = SSL_3DES, .algorithm_mac = SSL_SHA1, .algorithm_ssl = SSL_SSLV3, - .algo_strength = SSL_HIGH|SSL_FIPS, + .algo_strength = SSL_HIGH, .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, .strength_bits = 112, .alg_bits = 168, @@ -375,7 +375,7 @@ SSL_CIPHER ssl3_ciphers[] = { .algorithm_enc = SSL_3DES, .algorithm_mac = SSL_SHA1, .algorithm_ssl = SSL_SSLV3, - .algo_strength = SSL_HIGH|SSL_FIPS, + .algo_strength = SSL_HIGH, .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, .strength_bits = 112, .alg_bits = 168, @@ -423,7 +423,7 @@ SSL_CIPHER ssl3_ciphers[] = { .algorithm_enc = SSL_3DES, .algorithm_mac = SSL_SHA1, .algorithm_ssl = SSL_SSLV3, - .algo_strength = SSL_HIGH|SSL_FIPS, + .algo_strength = SSL_HIGH, .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, .strength_bits = 112, .alg_bits = 168, @@ -472,7 +472,7 @@ SSL_CIPHER ssl3_ciphers[] = { .algorithm_enc = SSL_3DES, .algorithm_mac = SSL_SHA1, .algorithm_ssl = SSL_SSLV3, - .algo_strength = SSL_HIGH|SSL_FIPS, + .algo_strength = SSL_HIGH, .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, .strength_bits = 112, .alg_bits = 168, @@ -520,7 +520,7 @@ SSL_CIPHER ssl3_ciphers[] = { .algorithm_enc = SSL_3DES, .algorithm_mac = SSL_SHA1, .algorithm_ssl = SSL_SSLV3, - .algo_strength = SSL_HIGH|SSL_FIPS, + .algo_strength = SSL_HIGH, .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, .strength_bits = 112, .alg_bits = 168, @@ -600,7 +600,7 @@ SSL_CIPHER ssl3_ciphers[] = { .algorithm_enc = SSL_3DES, .algorithm_mac = SSL_SHA1, .algorithm_ssl = SSL_SSLV3, - .algo_strength = SSL_HIGH|SSL_FIPS, + .algo_strength = SSL_HIGH, .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_HIGH|SSL_FIPS, + .algo_strength = SSL_HIGH, .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_HIGH|SSL_FIPS, + .algo_strength = SSL_HIGH, .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_HIGH|SSL_FIPS, + .algo_strength = SSL_HIGH, .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_HIGH|SSL_FIPS, + .algo_strength = SSL_HIGH, .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_HIGH|SSL_FIPS, + .algo_strength = SSL_HIGH, .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_HIGH|SSL_FIPS, + .algo_strength = SSL_HIGH, .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_HIGH|SSL_FIPS, + .algo_strength = SSL_HIGH, .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_HIGH|SSL_FIPS, + .algo_strength = SSL_HIGH, .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_HIGH|SSL_FIPS, + .algo_strength = SSL_HIGH, .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_HIGH|SSL_FIPS, + .algo_strength = SSL_HIGH, .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_HIGH|SSL_FIPS, + .algo_strength = SSL_HIGH, .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_HIGH|SSL_FIPS, + .algo_strength = SSL_HIGH, .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_STRONG_NONE|SSL_FIPS, + .algo_strength = SSL_STRONG_NONE, .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_HIGH|SSL_FIPS, + .algo_strength = SSL_HIGH, .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_HIGH|SSL_FIPS, + .algo_strength = SSL_HIGH, .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_HIGH|SSL_FIPS, + .algo_strength = SSL_HIGH, .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_HIGH|SSL_FIPS, + .algo_strength = SSL_HIGH, .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_HIGH|SSL_FIPS, + .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_HIGH|SSL_FIPS, + .algo_strength = SSL_HIGH, .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_HIGH|SSL_FIPS, + .algo_strength = SSL_HIGH, .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_HIGH|SSL_FIPS, + .algo_strength = SSL_HIGH, .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_HIGH|SSL_FIPS, + .algo_strength = SSL_HIGH, .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_HIGH|SSL_FIPS, + .algo_strength = SSL_HIGH, .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_HIGH|SSL_FIPS, + .algo_strength = SSL_HIGH, .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_HIGH|SSL_FIPS, + .algo_strength = SSL_HIGH, .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, .strength_bits = 256, .alg_bits = 256, @@ -1291,7 +1291,7 @@ SSL_CIPHER ssl3_ciphers[] = { .algorithm_enc = SSL_3DES, .algorithm_mac = SSL_SHA1, .algorithm_ssl = SSL_TLSV1, - .algo_strength = SSL_HIGH|SSL_FIPS, + .algo_strength = SSL_HIGH, .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_HIGH|SSL_FIPS, + .algo_strength = SSL_HIGH, .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_HIGH|SSL_FIPS, + .algo_strength = SSL_HIGH, .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_HIGH|SSL_FIPS, + .algo_strength = SSL_HIGH, .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_HIGH|SSL_FIPS, + .algo_strength = SSL_HIGH, .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_HIGH|SSL_FIPS, + .algo_strength = SSL_HIGH, .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_HIGH|SSL_FIPS, + .algo_strength = SSL_HIGH, .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_HIGH|SSL_FIPS, + .algo_strength = SSL_HIGH, .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_HIGH|SSL_FIPS, + .algo_strength = SSL_HIGH, .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_HIGH|SSL_FIPS, + .algo_strength = SSL_HIGH, .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_HIGH|SSL_FIPS, + .algo_strength = SSL_HIGH, .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_HIGH|SSL_FIPS, + .algo_strength = SSL_HIGH, .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_HIGH|SSL_FIPS, + .algo_strength = SSL_HIGH, .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_HIGH|SSL_FIPS, + .algo_strength = SSL_HIGH, .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_HIGH|SSL_FIPS, + .algo_strength = SSL_HIGH, .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_STRONG_NONE|SSL_FIPS, + .algo_strength = SSL_STRONG_NONE, .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, .strength_bits = 0, .alg_bits = 0, @@ -1590,7 +1590,7 @@ SSL_CIPHER ssl3_ciphers[] = { .algorithm_enc = SSL_3DES, .algorithm_mac = SSL_SHA1, .algorithm_ssl = SSL_TLSV1, - .algo_strength = SSL_HIGH|SSL_FIPS, + .algo_strength = SSL_HIGH, .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_HIGH|SSL_FIPS, + .algo_strength = SSL_HIGH, .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_HIGH|SSL_FIPS, + .algo_strength = SSL_HIGH, .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_STRONG_NONE|SSL_FIPS, + .algo_strength = SSL_STRONG_NONE, .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, .strength_bits = 0, .alg_bits = 0, @@ -1670,7 +1670,7 @@ SSL_CIPHER ssl3_ciphers[] = { .algorithm_enc = SSL_3DES, .algorithm_mac = SSL_SHA1, .algorithm_ssl = SSL_TLSV1, - .algo_strength = SSL_HIGH|SSL_FIPS, + .algo_strength = SSL_HIGH, .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_HIGH|SSL_FIPS, + .algo_strength = SSL_HIGH, .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_HIGH|SSL_FIPS, + .algo_strength = SSL_HIGH, .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_STRONG_NONE|SSL_FIPS, + .algo_strength = SSL_STRONG_NONE, .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, .strength_bits = 0, .alg_bits = 0, @@ -1750,7 +1750,7 @@ SSL_CIPHER ssl3_ciphers[] = { .algorithm_enc = SSL_3DES, .algorithm_mac = SSL_SHA1, .algorithm_ssl = SSL_TLSV1, - .algo_strength = SSL_HIGH|SSL_FIPS, + .algo_strength = SSL_HIGH, .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_HIGH|SSL_FIPS, + .algo_strength = SSL_HIGH, .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_HIGH|SSL_FIPS, + .algo_strength = SSL_HIGH, .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_STRONG_NONE|SSL_FIPS, + .algo_strength = SSL_STRONG_NONE, .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, .strength_bits = 0, .alg_bits = 0, @@ -1830,7 +1830,7 @@ SSL_CIPHER ssl3_ciphers[] = { .algorithm_enc = SSL_3DES, .algorithm_mac = SSL_SHA1, .algorithm_ssl = SSL_TLSV1, - .algo_strength = SSL_HIGH|SSL_FIPS, + .algo_strength = SSL_HIGH, .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_HIGH|SSL_FIPS, + .algo_strength = SSL_HIGH, .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_HIGH|SSL_FIPS, + .algo_strength = SSL_HIGH, .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_STRONG_NONE|SSL_FIPS, + .algo_strength = SSL_STRONG_NONE, .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, .strength_bits = 0, .alg_bits = 0, @@ -1910,7 +1910,7 @@ SSL_CIPHER ssl3_ciphers[] = { .algorithm_enc = SSL_3DES, .algorithm_mac = SSL_SHA1, .algorithm_ssl = SSL_TLSV1, - .algo_strength = SSL_HIGH|SSL_FIPS, + .algo_strength = SSL_HIGH, .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_HIGH|SSL_FIPS, + .algo_strength = SSL_HIGH, .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_HIGH|SSL_FIPS, + .algo_strength = SSL_HIGH, .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_HIGH|SSL_FIPS, + .algo_strength = SSL_HIGH, .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_HIGH|SSL_FIPS, + .algo_strength = SSL_HIGH, .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_HIGH|SSL_FIPS, + .algo_strength = SSL_HIGH, .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_HIGH|SSL_FIPS, + .algo_strength = SSL_HIGH, .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_HIGH|SSL_FIPS, + .algo_strength = SSL_HIGH, .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_HIGH|SSL_FIPS, + .algo_strength = SSL_HIGH, .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_HIGH|SSL_FIPS, + .algo_strength = SSL_HIGH, .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_HIGH|SSL_FIPS, + .algo_strength = SSL_HIGH, .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_HIGH|SSL_FIPS, + .algo_strength = SSL_HIGH, .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_HIGH|SSL_FIPS, + .algo_strength = SSL_HIGH, .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_HIGH|SSL_FIPS, + .algo_strength = SSL_HIGH, .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_HIGH|SSL_FIPS, + .algo_strength = SSL_HIGH, .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_HIGH|SSL_FIPS, + .algo_strength = SSL_HIGH, .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_HIGH|SSL_FIPS, + .algo_strength = SSL_HIGH, .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_HIGH|SSL_FIPS, + .algo_strength = SSL_HIGH, .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_HIGH|SSL_FIPS, + .algo_strength = SSL_HIGH, .algorithm2 = SSL_HANDSHAKE_MAC_SHA384|TLS1_PRF_SHA384| SSL_CIPHER_ALGORITHM2_AEAD|FIXED_NONCE_LEN(4)| SSL_CIPHER_ALGORITHM2_VARIABLE_NONCE_IN_RECORD, |