Clean up SSL_HANDSHAKE_MAC_DEFAULT.

The handshake MAC needs to be upgraded when TLSv1.0 and TLSv1.1 ciphersuites are used with TLSv1.2. Since we no longer support TLSv1.0 and TLSv1.1, we can simply upgrade the handshake MAC in the ciphersuite table and remove the various defines/macros/code that existed to handle the upgrade. ok tb@
author: jsing <> 2024-07-16 14:38:04 +0000
committer: jsing <> 2024-07-16 14:38:04 +0000
commit: 772f611f8f8ff3800ee3fe27142570622d06cc38 (patch)
tree: 2b4abb3d0d8f9b72dd3be8ba85d91d7d35b07f3d /src/lib/libssl/s3_lib.c
parent: b9ac2dff20ea5834ad8b30951507caf01cb04463 (diff)
download: openbsd-772f611f8f8ff3800ee3fe27142570622d06cc38.tar.gz
openbsd-772f611f8f8ff3800ee3fe27142570622d06cc38.tar.bz2
openbsd-772f611f8f8ff3800ee3fe27142570622d06cc38.zip
1 files changed, 36 insertions, 36 deletions
diff --git a/src/lib/libssl/s3_lib.c b/src/lib/libssl/s3_lib.c
index 1c1906d9e7..5fc42ca200 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.253 2024/07/15 14:45:15 jsing Exp $ */
+/* $OpenBSD: s3_lib.c,v 1.254 2024/07/16 14:38:04 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
 * All rights reserved.
 *
@@ -183,7 +183,7 @@ const SSL_CIPHER ssl3_ciphers[] = {
                .algorithm_mac = SSL_MD5,
                .algorithm_ssl = SSL_SSLV3,
                .algo_strength = SSL_STRONG_NONE,
-                .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT,
+                .algorithm2 = SSL_HANDSHAKE_MAC_SHA256,
                .strength_bits = 0,
                .alg_bits = 0,
        },
@@ -199,7 +199,7 @@ const SSL_CIPHER ssl3_ciphers[] = {
                .algorithm_mac = SSL_SHA1,
                .algorithm_ssl = SSL_SSLV3,
                .algo_strength = SSL_STRONG_NONE,
-                .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT,
+                .algorithm2 = SSL_HANDSHAKE_MAC_SHA256,
                .strength_bits = 0,
                .alg_bits = 0,
        },
@@ -215,7 +215,7 @@ const SSL_CIPHER ssl3_ciphers[] = {
                .algorithm_mac = SSL_MD5,
                .algorithm_ssl = SSL_SSLV3,
                .algo_strength = SSL_LOW,
-                .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT,
+                .algorithm2 = SSL_HANDSHAKE_MAC_SHA256,
                .strength_bits = 128,
                .alg_bits = 128,
        },
@@ -231,7 +231,7 @@ const SSL_CIPHER ssl3_ciphers[] = {
                .algorithm_mac = SSL_SHA1,
                .algorithm_ssl = SSL_SSLV3,
                .algo_strength = SSL_LOW,
-                .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT,
+                .algorithm2 = SSL_HANDSHAKE_MAC_SHA256,
                .strength_bits = 128,
                .alg_bits = 128,
        },
@@ -247,7 +247,7 @@ const SSL_CIPHER ssl3_ciphers[] = {
                .algorithm_mac = SSL_SHA1,
                .algorithm_ssl = SSL_SSLV3,
                .algo_strength = SSL_MEDIUM,
-                .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT,
+                .algorithm2 = SSL_HANDSHAKE_MAC_SHA256,
                .strength_bits = 112,
                .alg_bits = 168,
        },
@@ -267,7 +267,7 @@ const SSL_CIPHER ssl3_ciphers[] = {
                .algorithm_mac = SSL_SHA1,
                .algorithm_ssl = SSL_SSLV3,
                .algo_strength = SSL_MEDIUM,
-                .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT,
+                .algorithm2 = SSL_HANDSHAKE_MAC_SHA256,
                .strength_bits = 112,
                .alg_bits = 168,
        },
@@ -283,7 +283,7 @@ const SSL_CIPHER ssl3_ciphers[] = {
                .algorithm_mac = SSL_MD5,
                .algorithm_ssl = SSL_SSLV3,
                .algo_strength = SSL_LOW,
-                .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT,
+                .algorithm2 = SSL_HANDSHAKE_MAC_SHA256,
                .strength_bits = 128,
                .alg_bits = 128,
        },
@@ -299,7 +299,7 @@ const SSL_CIPHER ssl3_ciphers[] = {
                .algorithm_mac = SSL_SHA1,
                .algorithm_ssl = SSL_SSLV3,
                .algo_strength = SSL_MEDIUM,
-                .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT,
+                .algorithm2 = SSL_HANDSHAKE_MAC_SHA256,
                .strength_bits = 112,
                .alg_bits = 168,
        },
@@ -319,7 +319,7 @@ const SSL_CIPHER ssl3_ciphers[] = {
                .algorithm_mac = SSL_SHA1,
                .algorithm_ssl = SSL_TLSV1,
                .algo_strength = SSL_HIGH,
-                .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT,
+                .algorithm2 = SSL_HANDSHAKE_MAC_SHA256,
                .strength_bits = 128,
                .alg_bits = 128,
        },
@@ -335,7 +335,7 @@ const SSL_CIPHER ssl3_ciphers[] = {
                .algorithm_mac = SSL_SHA1,
                .algorithm_ssl = SSL_TLSV1,
                .algo_strength = SSL_HIGH,
-                .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT,
+                .algorithm2 = SSL_HANDSHAKE_MAC_SHA256,
                .strength_bits = 128,
                .alg_bits = 128,
        },
@@ -351,7 +351,7 @@ const SSL_CIPHER ssl3_ciphers[] = {
                .algorithm_mac = SSL_SHA1,
                .algorithm_ssl = SSL_TLSV1,
                .algo_strength = SSL_HIGH,
-                .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT,
+                .algorithm2 = SSL_HANDSHAKE_MAC_SHA256,
                .strength_bits = 128,
                .alg_bits = 128,
        },
@@ -367,7 +367,7 @@ const SSL_CIPHER ssl3_ciphers[] = {
                .algorithm_mac = SSL_SHA1,
                .algorithm_ssl = SSL_TLSV1,
                .algo_strength = SSL_HIGH,
-                .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT,
+                .algorithm2 = SSL_HANDSHAKE_MAC_SHA256,
                .strength_bits = 256,
                .alg_bits = 256,
        },
@@ -383,7 +383,7 @@ const SSL_CIPHER ssl3_ciphers[] = {
                .algorithm_mac = SSL_SHA1,
                .algorithm_ssl = SSL_TLSV1,
                .algo_strength = SSL_HIGH,
-                .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT,
+                .algorithm2 = SSL_HANDSHAKE_MAC_SHA256,
                .strength_bits = 256,
                .alg_bits = 256,
        },
@@ -399,7 +399,7 @@ const SSL_CIPHER ssl3_ciphers[] = {
                .algorithm_mac = SSL_SHA1,
                .algorithm_ssl = SSL_TLSV1,
                .algo_strength = SSL_HIGH,
-                .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT,
+                .algorithm2 = SSL_HANDSHAKE_MAC_SHA256,
                .strength_bits = 256,
                .alg_bits = 256,
        },
@@ -467,7 +467,7 @@ const SSL_CIPHER ssl3_ciphers[] = {
                .algorithm_mac = SSL_SHA1,
                .algorithm_ssl = SSL_TLSV1,
                .algo_strength = SSL_HIGH,
-                .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT,
+                .algorithm2 = SSL_HANDSHAKE_MAC_SHA256,
                .strength_bits = 128,
                .alg_bits = 128,
        },
@@ -483,7 +483,7 @@ const SSL_CIPHER ssl3_ciphers[] = {
                .algorithm_mac = SSL_SHA1,
                .algorithm_ssl = SSL_TLSV1,
                .algo_strength = SSL_HIGH,
-                .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT,
+                .algorithm2 = SSL_HANDSHAKE_MAC_SHA256,
                .strength_bits = 128,
                .alg_bits = 128,
        },
@@ -499,7 +499,7 @@ const SSL_CIPHER ssl3_ciphers[] = {
                .algorithm_mac = SSL_SHA1,
                .algorithm_ssl = SSL_TLSV1,
                .algo_strength = SSL_HIGH,
-                .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT,
+                .algorithm2 = SSL_HANDSHAKE_MAC_SHA256,
                .strength_bits = 128,
                .alg_bits = 128,
        },
@@ -584,7 +584,7 @@ const SSL_CIPHER ssl3_ciphers[] = {
                .algorithm_mac = SSL_SHA1,
                .algorithm_ssl = SSL_TLSV1,
                .algo_strength = SSL_HIGH,
-                .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT,
+                .algorithm2 = SSL_HANDSHAKE_MAC_SHA256,
                .strength_bits = 256,
                .alg_bits = 256,
        },
@@ -600,7 +600,7 @@ const SSL_CIPHER ssl3_ciphers[] = {
                .algorithm_mac = SSL_SHA1,
                .algorithm_ssl = SSL_TLSV1,
                .algo_strength = SSL_HIGH,
-                .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT,
+                .algorithm2 = SSL_HANDSHAKE_MAC_SHA256,
                .strength_bits = 256,
                .alg_bits = 256,
        },
@@ -616,7 +616,7 @@ const SSL_CIPHER ssl3_ciphers[] = {
                .algorithm_mac = SSL_SHA1,
                .algorithm_ssl = SSL_TLSV1,
                .algo_strength = SSL_HIGH,
-                .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT,
+                .algorithm2 = SSL_HANDSHAKE_MAC_SHA256,
                .strength_bits = 256,
                .alg_bits = 256,
        },
@@ -887,7 +887,7 @@ const SSL_CIPHER ssl3_ciphers[] = {
                .algorithm_mac = SSL_SHA1,
                .algorithm_ssl = SSL_TLSV1,
                .algo_strength = SSL_STRONG_NONE,
-                .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT,
+                .algorithm2 = SSL_HANDSHAKE_MAC_SHA256,
                .strength_bits = 0,
                .alg_bits = 0,
        },
@@ -903,7 +903,7 @@ const SSL_CIPHER ssl3_ciphers[] = {
                .algorithm_mac = SSL_SHA1,
                .algorithm_ssl = SSL_TLSV1,
                .algo_strength = SSL_LOW,
-                .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT,
+                .algorithm2 = SSL_HANDSHAKE_MAC_SHA256,
                .strength_bits = 128,
                .alg_bits = 128,
        },
@@ -919,7 +919,7 @@ const SSL_CIPHER ssl3_ciphers[] = {
                .algorithm_mac = SSL_SHA1,
                .algorithm_ssl = SSL_TLSV1,
                .algo_strength = SSL_MEDIUM,
-                .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT,
+                .algorithm2 = SSL_HANDSHAKE_MAC_SHA256,
                .strength_bits = 112,
                .alg_bits = 168,
        },
@@ -935,7 +935,7 @@ const SSL_CIPHER ssl3_ciphers[] = {
                .algorithm_mac = SSL_SHA1,
                .algorithm_ssl = SSL_TLSV1,
                .algo_strength = SSL_HIGH,
-                .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT,
+                .algorithm2 = SSL_HANDSHAKE_MAC_SHA256,
                .strength_bits = 128,
                .alg_bits = 128,
        },
@@ -951,7 +951,7 @@ const SSL_CIPHER ssl3_ciphers[] = {
                .algorithm_mac = SSL_SHA1,
                .algorithm_ssl = SSL_TLSV1,
                .algo_strength = SSL_HIGH,
-                .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT,
+                .algorithm2 = SSL_HANDSHAKE_MAC_SHA256,
                .strength_bits = 256,
                .alg_bits = 256,
        },
@@ -967,7 +967,7 @@ const SSL_CIPHER ssl3_ciphers[] = {
                .algorithm_mac = SSL_SHA1,
                .algorithm_ssl = SSL_TLSV1,
                .algo_strength = SSL_STRONG_NONE,
-                .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT,
+                .algorithm2 = SSL_HANDSHAKE_MAC_SHA256,
                .strength_bits = 0,
                .alg_bits = 0,
        },
@@ -983,7 +983,7 @@ const SSL_CIPHER ssl3_ciphers[] = {
                .algorithm_mac = SSL_SHA1,
                .algorithm_ssl = SSL_TLSV1,
                .algo_strength = SSL_LOW,
-                .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT,
+                .algorithm2 = SSL_HANDSHAKE_MAC_SHA256,
                .strength_bits = 128,
                .alg_bits = 128,
        },
@@ -999,7 +999,7 @@ const SSL_CIPHER ssl3_ciphers[] = {
                .algorithm_mac = SSL_SHA1,
                .algorithm_ssl = SSL_TLSV1,
                .algo_strength = SSL_MEDIUM,
-                .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT,
+                .algorithm2 = SSL_HANDSHAKE_MAC_SHA256,
                .strength_bits = 112,
                .alg_bits = 168,
        },
@@ -1015,7 +1015,7 @@ const SSL_CIPHER ssl3_ciphers[] = {
                .algorithm_mac = SSL_SHA1,
                .algorithm_ssl = SSL_TLSV1,
                .algo_strength = SSL_HIGH,
-                .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT,
+                .algorithm2 = SSL_HANDSHAKE_MAC_SHA256,
                .strength_bits = 128,
                .alg_bits = 128,
        },
@@ -1031,7 +1031,7 @@ const SSL_CIPHER ssl3_ciphers[] = {
                .algorithm_mac = SSL_SHA1,
                .algorithm_ssl = SSL_TLSV1,
                .algo_strength = SSL_HIGH,
-                .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT,
+                .algorithm2 = SSL_HANDSHAKE_MAC_SHA256,
                .strength_bits = 256,
                .alg_bits = 256,
        },
@@ -1047,7 +1047,7 @@ const SSL_CIPHER ssl3_ciphers[] = {
                .algorithm_mac = SSL_SHA1,
                .algorithm_ssl = SSL_TLSV1,
                .algo_strength = SSL_STRONG_NONE,
-                .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT,
+                .algorithm2 = SSL_HANDSHAKE_MAC_SHA256,
                .strength_bits = 0,
                .alg_bits = 0,
        },
@@ -1063,7 +1063,7 @@ const SSL_CIPHER ssl3_ciphers[] = {
                .algorithm_mac = SSL_SHA1,
                .algorithm_ssl = SSL_TLSV1,
                .algo_strength = SSL_LOW,
-                .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT,
+                .algorithm2 = SSL_HANDSHAKE_MAC_SHA256,
                .strength_bits = 128,
                .alg_bits = 128,
        },
@@ -1079,7 +1079,7 @@ const SSL_CIPHER ssl3_ciphers[] = {
                .algorithm_mac = SSL_SHA1,
                .algorithm_ssl = SSL_TLSV1,
                .algo_strength = SSL_MEDIUM,
-                .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT,
+                .algorithm2 = SSL_HANDSHAKE_MAC_SHA256,
                .strength_bits = 112,
                .alg_bits = 168,
        },
@@ -1095,7 +1095,7 @@ const SSL_CIPHER ssl3_ciphers[] = {
                .algorithm_mac = SSL_SHA1,
                .algorithm_ssl = SSL_TLSV1,
                .algo_strength = SSL_HIGH,
-                .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT,
+                .algorithm2 = SSL_HANDSHAKE_MAC_SHA256,
                .strength_bits = 128,
                .alg_bits = 128,
        },
@@ -1111,7 +1111,7 @@ const SSL_CIPHER ssl3_ciphers[] = {
                .algorithm_mac = SSL_SHA1,
                .algorithm_ssl = SSL_TLSV1,
                .algo_strength = SSL_HIGH,
-                .algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT,
+                .algorithm2 = SSL_HANDSHAKE_MAC_SHA256,
                .strength_bits = 256,
                .alg_bits = 256,
        },
author	jsing <>	2024-07-16 14:38:04 +0000
committer	jsing <>	2024-07-16 14:38:04 +0000
commit	772f611f8f8ff3800ee3fe27142570622d06cc38 (patch)
tree	2b4abb3d0d8f9b72dd3be8ba85d91d7d35b07f3d /src/lib/libssl/s3_lib.c
parent	b9ac2dff20ea5834ad8b30951507caf01cb04463 (diff)
download	openbsd-772f611f8f8ff3800ee3fe27142570622d06cc38.tar.gz openbsd-772f611f8f8ff3800ee3fe27142570622d06cc38.tar.bz2 openbsd-772f611f8f8ff3800ee3fe27142570622d06cc38.zip

diff --git a/src/lib/libssl/s3_lib.c b/src/lib/libssl/s3_lib.c index 1c1906d9e7..5fc42ca200 100644 --- a/src/lib/libssl/s3_lib.c +++ b/src/lib/libssl/s3_lib.c
@@ -1,4 +1,4 @@
1	/* $OpenBSD: s3_lib.c,v 1.253 2024/07/15 14:45:15 jsing Exp $ */	1	/* $OpenBSD: s3_lib.c,v 1.254 2024/07/16 14:38:04 jsing Exp $ */
2	/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)	2	/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3	* All rights reserved.	3	* All rights reserved.
4	*	4	*
@@ -183,7 +183,7 @@ const SSL_CIPHER ssl3_ciphers[] = {
183	.algorithm_mac = SSL_MD5,	183	.algorithm_mac = SSL_MD5,
184	.algorithm_ssl = SSL_SSLV3,	184	.algorithm_ssl = SSL_SSLV3,
185	.algo_strength = SSL_STRONG_NONE,	185	.algo_strength = SSL_STRONG_NONE,
186	.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT,	186	.algorithm2 = SSL_HANDSHAKE_MAC_SHA256,
187	.strength_bits = 0,	187	.strength_bits = 0,
188	.alg_bits = 0,	188	.alg_bits = 0,
189	},	189	},
@@ -199,7 +199,7 @@ const SSL_CIPHER ssl3_ciphers[] = {
199	.algorithm_mac = SSL_SHA1,	199	.algorithm_mac = SSL_SHA1,
200	.algorithm_ssl = SSL_SSLV3,	200	.algorithm_ssl = SSL_SSLV3,
201	.algo_strength = SSL_STRONG_NONE,	201	.algo_strength = SSL_STRONG_NONE,
202	.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT,	202	.algorithm2 = SSL_HANDSHAKE_MAC_SHA256,
203	.strength_bits = 0,	203	.strength_bits = 0,
204	.alg_bits = 0,	204	.alg_bits = 0,
205	},	205	},
@@ -215,7 +215,7 @@ const SSL_CIPHER ssl3_ciphers[] = {
215	.algorithm_mac = SSL_MD5,	215	.algorithm_mac = SSL_MD5,
216	.algorithm_ssl = SSL_SSLV3,	216	.algorithm_ssl = SSL_SSLV3,
217	.algo_strength = SSL_LOW,	217	.algo_strength = SSL_LOW,
218	.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT,	218	.algorithm2 = SSL_HANDSHAKE_MAC_SHA256,
219	.strength_bits = 128,	219	.strength_bits = 128,
220	.alg_bits = 128,	220	.alg_bits = 128,
221	},	221	},
@@ -231,7 +231,7 @@ const SSL_CIPHER ssl3_ciphers[] = {
231	.algorithm_mac = SSL_SHA1,	231	.algorithm_mac = SSL_SHA1,
232	.algorithm_ssl = SSL_SSLV3,	232	.algorithm_ssl = SSL_SSLV3,
233	.algo_strength = SSL_LOW,	233	.algo_strength = SSL_LOW,
234	.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT,	234	.algorithm2 = SSL_HANDSHAKE_MAC_SHA256,
235	.strength_bits = 128,	235	.strength_bits = 128,
236	.alg_bits = 128,	236	.alg_bits = 128,
237	},	237	},
@@ -247,7 +247,7 @@ const SSL_CIPHER ssl3_ciphers[] = {
247	.algorithm_mac = SSL_SHA1,	247	.algorithm_mac = SSL_SHA1,
248	.algorithm_ssl = SSL_SSLV3,	248	.algorithm_ssl = SSL_SSLV3,
249	.algo_strength = SSL_MEDIUM,	249	.algo_strength = SSL_MEDIUM,
250	.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT,	250	.algorithm2 = SSL_HANDSHAKE_MAC_SHA256,
251	.strength_bits = 112,	251	.strength_bits = 112,
252	.alg_bits = 168,	252	.alg_bits = 168,
253	},	253	},
@@ -267,7 +267,7 @@ const SSL_CIPHER ssl3_ciphers[] = {
267	.algorithm_mac = SSL_SHA1,	267	.algorithm_mac = SSL_SHA1,
268	.algorithm_ssl = SSL_SSLV3,	268	.algorithm_ssl = SSL_SSLV3,
269	.algo_strength = SSL_MEDIUM,	269	.algo_strength = SSL_MEDIUM,
270	.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT,	270	.algorithm2 = SSL_HANDSHAKE_MAC_SHA256,
271	.strength_bits = 112,	271	.strength_bits = 112,
272	.alg_bits = 168,	272	.alg_bits = 168,
273	},	273	},
@@ -283,7 +283,7 @@ const SSL_CIPHER ssl3_ciphers[] = {
283	.algorithm_mac = SSL_MD5,	283	.algorithm_mac = SSL_MD5,
284	.algorithm_ssl = SSL_SSLV3,	284	.algorithm_ssl = SSL_SSLV3,
285	.algo_strength = SSL_LOW,	285	.algo_strength = SSL_LOW,
286	.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT,	286	.algorithm2 = SSL_HANDSHAKE_MAC_SHA256,
287	.strength_bits = 128,	287	.strength_bits = 128,
288	.alg_bits = 128,	288	.alg_bits = 128,
289	},	289	},
@@ -299,7 +299,7 @@ const SSL_CIPHER ssl3_ciphers[] = {
299	.algorithm_mac = SSL_SHA1,	299	.algorithm_mac = SSL_SHA1,
300	.algorithm_ssl = SSL_SSLV3,	300	.algorithm_ssl = SSL_SSLV3,
301	.algo_strength = SSL_MEDIUM,	301	.algo_strength = SSL_MEDIUM,
302	.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT,	302	.algorithm2 = SSL_HANDSHAKE_MAC_SHA256,
303	.strength_bits = 112,	303	.strength_bits = 112,
304	.alg_bits = 168,	304	.alg_bits = 168,
305	},	305	},
@@ -319,7 +319,7 @@ const SSL_CIPHER ssl3_ciphers[] = {
319	.algorithm_mac = SSL_SHA1,	319	.algorithm_mac = SSL_SHA1,
320	.algorithm_ssl = SSL_TLSV1,	320	.algorithm_ssl = SSL_TLSV1,
321	.algo_strength = SSL_HIGH,	321	.algo_strength = SSL_HIGH,
322	.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT,	322	.algorithm2 = SSL_HANDSHAKE_MAC_SHA256,
323	.strength_bits = 128,	323	.strength_bits = 128,
324	.alg_bits = 128,	324	.alg_bits = 128,
325	},	325	},
@@ -335,7 +335,7 @@ const SSL_CIPHER ssl3_ciphers[] = {
335	.algorithm_mac = SSL_SHA1,	335	.algorithm_mac = SSL_SHA1,
336	.algorithm_ssl = SSL_TLSV1,	336	.algorithm_ssl = SSL_TLSV1,
337	.algo_strength = SSL_HIGH,	337	.algo_strength = SSL_HIGH,
338	.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT,	338	.algorithm2 = SSL_HANDSHAKE_MAC_SHA256,
339	.strength_bits = 128,	339	.strength_bits = 128,
340	.alg_bits = 128,	340	.alg_bits = 128,
341	},	341	},
@@ -351,7 +351,7 @@ const SSL_CIPHER ssl3_ciphers[] = {
351	.algorithm_mac = SSL_SHA1,	351	.algorithm_mac = SSL_SHA1,
352	.algorithm_ssl = SSL_TLSV1,	352	.algorithm_ssl = SSL_TLSV1,
353	.algo_strength = SSL_HIGH,	353	.algo_strength = SSL_HIGH,
354	.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT,	354	.algorithm2 = SSL_HANDSHAKE_MAC_SHA256,
355	.strength_bits = 128,	355	.strength_bits = 128,
356	.alg_bits = 128,	356	.alg_bits = 128,
357	},	357	},
@@ -367,7 +367,7 @@ const SSL_CIPHER ssl3_ciphers[] = {
367	.algorithm_mac = SSL_SHA1,	367	.algorithm_mac = SSL_SHA1,
368	.algorithm_ssl = SSL_TLSV1,	368	.algorithm_ssl = SSL_TLSV1,
369	.algo_strength = SSL_HIGH,	369	.algo_strength = SSL_HIGH,
370	.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT,	370	.algorithm2 = SSL_HANDSHAKE_MAC_SHA256,
371	.strength_bits = 256,	371	.strength_bits = 256,
372	.alg_bits = 256,	372	.alg_bits = 256,
373	},	373	},
@@ -383,7 +383,7 @@ const SSL_CIPHER ssl3_ciphers[] = {
383	.algorithm_mac = SSL_SHA1,	383	.algorithm_mac = SSL_SHA1,
384	.algorithm_ssl = SSL_TLSV1,	384	.algorithm_ssl = SSL_TLSV1,
385	.algo_strength = SSL_HIGH,	385	.algo_strength = SSL_HIGH,
386	.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT,	386	.algorithm2 = SSL_HANDSHAKE_MAC_SHA256,
387	.strength_bits = 256,	387	.strength_bits = 256,
388	.alg_bits = 256,	388	.alg_bits = 256,
389	},	389	},
@@ -399,7 +399,7 @@ const SSL_CIPHER ssl3_ciphers[] = {
399	.algorithm_mac = SSL_SHA1,	399	.algorithm_mac = SSL_SHA1,
400	.algorithm_ssl = SSL_TLSV1,	400	.algorithm_ssl = SSL_TLSV1,
401	.algo_strength = SSL_HIGH,	401	.algo_strength = SSL_HIGH,
402	.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT,	402	.algorithm2 = SSL_HANDSHAKE_MAC_SHA256,
403	.strength_bits = 256,	403	.strength_bits = 256,
404	.alg_bits = 256,	404	.alg_bits = 256,
405	},	405	},
@@ -467,7 +467,7 @@ const SSL_CIPHER ssl3_ciphers[] = {
467	.algorithm_mac = SSL_SHA1,	467	.algorithm_mac = SSL_SHA1,
468	.algorithm_ssl = SSL_TLSV1,	468	.algorithm_ssl = SSL_TLSV1,
469	.algo_strength = SSL_HIGH,	469	.algo_strength = SSL_HIGH,
470	.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT,	470	.algorithm2 = SSL_HANDSHAKE_MAC_SHA256,
471	.strength_bits = 128,	471	.strength_bits = 128,
472	.alg_bits = 128,	472	.alg_bits = 128,
473	},	473	},
@@ -483,7 +483,7 @@ const SSL_CIPHER ssl3_ciphers[] = {
483	.algorithm_mac = SSL_SHA1,	483	.algorithm_mac = SSL_SHA1,
484	.algorithm_ssl = SSL_TLSV1,	484	.algorithm_ssl = SSL_TLSV1,
485	.algo_strength = SSL_HIGH,	485	.algo_strength = SSL_HIGH,
486	.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT,	486	.algorithm2 = SSL_HANDSHAKE_MAC_SHA256,
487	.strength_bits = 128,	487	.strength_bits = 128,
488	.alg_bits = 128,	488	.alg_bits = 128,
489	},	489	},
@@ -499,7 +499,7 @@ const SSL_CIPHER ssl3_ciphers[] = {
499	.algorithm_mac = SSL_SHA1,	499	.algorithm_mac = SSL_SHA1,
500	.algorithm_ssl = SSL_TLSV1,	500	.algorithm_ssl = SSL_TLSV1,
501	.algo_strength = SSL_HIGH,	501	.algo_strength = SSL_HIGH,
502	.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT,	502	.algorithm2 = SSL_HANDSHAKE_MAC_SHA256,
503	.strength_bits = 128,	503	.strength_bits = 128,
504	.alg_bits = 128,	504	.alg_bits = 128,
505	},	505	},
@@ -584,7 +584,7 @@ const SSL_CIPHER ssl3_ciphers[] = {
584	.algorithm_mac = SSL_SHA1,	584	.algorithm_mac = SSL_SHA1,
585	.algorithm_ssl = SSL_TLSV1,	585	.algorithm_ssl = SSL_TLSV1,
586	.algo_strength = SSL_HIGH,	586	.algo_strength = SSL_HIGH,
587	.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT,	587	.algorithm2 = SSL_HANDSHAKE_MAC_SHA256,
588	.strength_bits = 256,	588	.strength_bits = 256,
589	.alg_bits = 256,	589	.alg_bits = 256,
590	},	590	},
@@ -600,7 +600,7 @@ const SSL_CIPHER ssl3_ciphers[] = {
600	.algorithm_mac = SSL_SHA1,	600	.algorithm_mac = SSL_SHA1,
601	.algorithm_ssl = SSL_TLSV1,	601	.algorithm_ssl = SSL_TLSV1,
602	.algo_strength = SSL_HIGH,	602	.algo_strength = SSL_HIGH,
603	.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT,	603	.algorithm2 = SSL_HANDSHAKE_MAC_SHA256,
604	.strength_bits = 256,	604	.strength_bits = 256,
605	.alg_bits = 256,	605	.alg_bits = 256,
606	},	606	},
@@ -616,7 +616,7 @@ const SSL_CIPHER ssl3_ciphers[] = {
616	.algorithm_mac = SSL_SHA1,	616	.algorithm_mac = SSL_SHA1,
617	.algorithm_ssl = SSL_TLSV1,	617	.algorithm_ssl = SSL_TLSV1,
618	.algo_strength = SSL_HIGH,	618	.algo_strength = SSL_HIGH,
619	.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT,	619	.algorithm2 = SSL_HANDSHAKE_MAC_SHA256,
620	.strength_bits = 256,	620	.strength_bits = 256,
621	.alg_bits = 256,	621	.alg_bits = 256,
622	},	622	},
@@ -887,7 +887,7 @@ const SSL_CIPHER ssl3_ciphers[] = {
887	.algorithm_mac = SSL_SHA1,	887	.algorithm_mac = SSL_SHA1,
888	.algorithm_ssl = SSL_TLSV1,	888	.algorithm_ssl = SSL_TLSV1,
889	.algo_strength = SSL_STRONG_NONE,	889	.algo_strength = SSL_STRONG_NONE,
890	.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT,	890	.algorithm2 = SSL_HANDSHAKE_MAC_SHA256,
891	.strength_bits = 0,	891	.strength_bits = 0,
892	.alg_bits = 0,	892	.alg_bits = 0,
893	},	893	},
@@ -903,7 +903,7 @@ const SSL_CIPHER ssl3_ciphers[] = {
903	.algorithm_mac = SSL_SHA1,	903	.algorithm_mac = SSL_SHA1,
904	.algorithm_ssl = SSL_TLSV1,	904	.algorithm_ssl = SSL_TLSV1,
905	.algo_strength = SSL_LOW,	905	.algo_strength = SSL_LOW,
906	.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT,	906	.algorithm2 = SSL_HANDSHAKE_MAC_SHA256,
907	.strength_bits = 128,	907	.strength_bits = 128,
908	.alg_bits = 128,	908	.alg_bits = 128,
909	},	909	},
@@ -919,7 +919,7 @@ const SSL_CIPHER ssl3_ciphers[] = {
919	.algorithm_mac = SSL_SHA1,	919	.algorithm_mac = SSL_SHA1,
920	.algorithm_ssl = SSL_TLSV1,	920	.algorithm_ssl = SSL_TLSV1,
921	.algo_strength = SSL_MEDIUM,	921	.algo_strength = SSL_MEDIUM,
922	.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT,	922	.algorithm2 = SSL_HANDSHAKE_MAC_SHA256,
923	.strength_bits = 112,	923	.strength_bits = 112,
924	.alg_bits = 168,	924	.alg_bits = 168,
925	},	925	},
@@ -935,7 +935,7 @@ const SSL_CIPHER ssl3_ciphers[] = {
935	.algorithm_mac = SSL_SHA1,	935	.algorithm_mac = SSL_SHA1,
936	.algorithm_ssl = SSL_TLSV1,	936	.algorithm_ssl = SSL_TLSV1,
937	.algo_strength = SSL_HIGH,	937	.algo_strength = SSL_HIGH,
938	.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT,	938	.algorithm2 = SSL_HANDSHAKE_MAC_SHA256,
939	.strength_bits = 128,	939	.strength_bits = 128,
940	.alg_bits = 128,	940	.alg_bits = 128,
941	},	941	},
@@ -951,7 +951,7 @@ const SSL_CIPHER ssl3_ciphers[] = {
951	.algorithm_mac = SSL_SHA1,	951	.algorithm_mac = SSL_SHA1,
952	.algorithm_ssl = SSL_TLSV1,	952	.algorithm_ssl = SSL_TLSV1,
953	.algo_strength = SSL_HIGH,	953	.algo_strength = SSL_HIGH,
954	.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT,	954	.algorithm2 = SSL_HANDSHAKE_MAC_SHA256,
955	.strength_bits = 256,	955	.strength_bits = 256,
956	.alg_bits = 256,	956	.alg_bits = 256,
957	},	957	},
@@ -967,7 +967,7 @@ const SSL_CIPHER ssl3_ciphers[] = {
967	.algorithm_mac = SSL_SHA1,	967	.algorithm_mac = SSL_SHA1,
968	.algorithm_ssl = SSL_TLSV1,	968	.algorithm_ssl = SSL_TLSV1,
969	.algo_strength = SSL_STRONG_NONE,	969	.algo_strength = SSL_STRONG_NONE,
970	.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT,	970	.algorithm2 = SSL_HANDSHAKE_MAC_SHA256,
971	.strength_bits = 0,	971	.strength_bits = 0,
972	.alg_bits = 0,	972	.alg_bits = 0,
973	},	973	},
@@ -983,7 +983,7 @@ const SSL_CIPHER ssl3_ciphers[] = {
983	.algorithm_mac = SSL_SHA1,	983	.algorithm_mac = SSL_SHA1,
984	.algorithm_ssl = SSL_TLSV1,	984	.algorithm_ssl = SSL_TLSV1,
985	.algo_strength = SSL_LOW,	985	.algo_strength = SSL_LOW,
986	.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT,	986	.algorithm2 = SSL_HANDSHAKE_MAC_SHA256,
987	.strength_bits = 128,	987	.strength_bits = 128,
988	.alg_bits = 128,	988	.alg_bits = 128,
989	},	989	},
@@ -999,7 +999,7 @@ const SSL_CIPHER ssl3_ciphers[] = {
999	.algorithm_mac = SSL_SHA1,	999	.algorithm_mac = SSL_SHA1,
1000	.algorithm_ssl = SSL_TLSV1,	1000	.algorithm_ssl = SSL_TLSV1,
1001	.algo_strength = SSL_MEDIUM,	1001	.algo_strength = SSL_MEDIUM,
1002	.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT,	1002	.algorithm2 = SSL_HANDSHAKE_MAC_SHA256,
1003	.strength_bits = 112,	1003	.strength_bits = 112,
1004	.alg_bits = 168,	1004	.alg_bits = 168,
1005	},	1005	},
@@ -1015,7 +1015,7 @@ const SSL_CIPHER ssl3_ciphers[] = {
1015	.algorithm_mac = SSL_SHA1,	1015	.algorithm_mac = SSL_SHA1,
1016	.algorithm_ssl = SSL_TLSV1,	1016	.algorithm_ssl = SSL_TLSV1,
1017	.algo_strength = SSL_HIGH,	1017	.algo_strength = SSL_HIGH,
1018	.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT,	1018	.algorithm2 = SSL_HANDSHAKE_MAC_SHA256,
1019	.strength_bits = 128,	1019	.strength_bits = 128,
1020	.alg_bits = 128,	1020	.alg_bits = 128,
1021	},	1021	},
@@ -1031,7 +1031,7 @@ const SSL_CIPHER ssl3_ciphers[] = {
1031	.algorithm_mac = SSL_SHA1,	1031	.algorithm_mac = SSL_SHA1,
1032	.algorithm_ssl = SSL_TLSV1,	1032	.algorithm_ssl = SSL_TLSV1,
1033	.algo_strength = SSL_HIGH,	1033	.algo_strength = SSL_HIGH,
1034	.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT,	1034	.algorithm2 = SSL_HANDSHAKE_MAC_SHA256,
1035	.strength_bits = 256,	1035	.strength_bits = 256,
1036	.alg_bits = 256,	1036	.alg_bits = 256,
1037	},	1037	},
@@ -1047,7 +1047,7 @@ const SSL_CIPHER ssl3_ciphers[] = {
1047	.algorithm_mac = SSL_SHA1,	1047	.algorithm_mac = SSL_SHA1,
1048	.algorithm_ssl = SSL_TLSV1,	1048	.algorithm_ssl = SSL_TLSV1,
1049	.algo_strength = SSL_STRONG_NONE,	1049	.algo_strength = SSL_STRONG_NONE,
1050	.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT,	1050	.algorithm2 = SSL_HANDSHAKE_MAC_SHA256,
1051	.strength_bits = 0,	1051	.strength_bits = 0,
1052	.alg_bits = 0,	1052	.alg_bits = 0,
1053	},	1053	},
@@ -1063,7 +1063,7 @@ const SSL_CIPHER ssl3_ciphers[] = {
1063	.algorithm_mac = SSL_SHA1,	1063	.algorithm_mac = SSL_SHA1,
1064	.algorithm_ssl = SSL_TLSV1,	1064	.algorithm_ssl = SSL_TLSV1,
1065	.algo_strength = SSL_LOW,	1065	.algo_strength = SSL_LOW,
1066	.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT,	1066	.algorithm2 = SSL_HANDSHAKE_MAC_SHA256,
1067	.strength_bits = 128,	1067	.strength_bits = 128,
1068	.alg_bits = 128,	1068	.alg_bits = 128,
1069	},	1069	},
@@ -1079,7 +1079,7 @@ const SSL_CIPHER ssl3_ciphers[] = {
1079	.algorithm_mac = SSL_SHA1,	1079	.algorithm_mac = SSL_SHA1,
1080	.algorithm_ssl = SSL_TLSV1,	1080	.algorithm_ssl = SSL_TLSV1,
1081	.algo_strength = SSL_MEDIUM,	1081	.algo_strength = SSL_MEDIUM,
1082	.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT,	1082	.algorithm2 = SSL_HANDSHAKE_MAC_SHA256,
1083	.strength_bits = 112,	1083	.strength_bits = 112,
1084	.alg_bits = 168,	1084	.alg_bits = 168,
1085	},	1085	},
@@ -1095,7 +1095,7 @@ const SSL_CIPHER ssl3_ciphers[] = {
1095	.algorithm_mac = SSL_SHA1,	1095	.algorithm_mac = SSL_SHA1,
1096	.algorithm_ssl = SSL_TLSV1,	1096	.algorithm_ssl = SSL_TLSV1,
1097	.algo_strength = SSL_HIGH,	1097	.algo_strength = SSL_HIGH,
1098	.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT,	1098	.algorithm2 = SSL_HANDSHAKE_MAC_SHA256,
1099	.strength_bits = 128,	1099	.strength_bits = 128,
1100	.alg_bits = 128,	1100	.alg_bits = 128,
1101	},	1101	},
@@ -1111,7 +1111,7 @@ const SSL_CIPHER ssl3_ciphers[] = {
1111	.algorithm_mac = SSL_SHA1,	1111	.algorithm_mac = SSL_SHA1,
1112	.algorithm_ssl = SSL_TLSV1,	1112	.algorithm_ssl = SSL_TLSV1,
1113	.algo_strength = SSL_HIGH,	1113	.algo_strength = SSL_HIGH,
1114	.algorithm2 = SSL_HANDSHAKE_MAC_DEFAULT,	1114	.algorithm2 = SSL_HANDSHAKE_MAC_SHA256,
1115	.strength_bits = 256,	1115	.strength_bits = 256,
1116	.alg_bits = 256,	1116	.alg_bits = 256,
1117	},	1117	},