Drop SSL_CIPHER_ALGORITHM2_AEAD flag.

All of our algorithm_mac == SSL_AEAD cipher suites use EVP_AEAD, so we can condition on that rather than having a separate redundant flag. ok tb@
author: jsing <> 2018-09-06 16:40:45 +0000
committer: jsing <> 2018-09-06 16:40:45 +0000
commit: 72f73019933c7339b36a51b22acc8440b8608f61 (patch)
tree: e66e90f0f003a49e386ad0667b3e568deec4c31a /src/lib/libssl/s3_lib.c
parent: a267c63d946b543a11f0afc79e6a96b027035b7c (diff)
download: openbsd-72f73019933c7339b36a51b22acc8440b8608f61.tar.gz
openbsd-72f73019933c7339b36a51b22acc8440b8608f61.tar.bz2
openbsd-72f73019933c7339b36a51b22acc8440b8608f61.zip
1 files changed, 14 insertions, 14 deletions
diff --git a/src/lib/libssl/s3_lib.c b/src/lib/libssl/s3_lib.c
index 6e12bf9503..02e6c66a47 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.169 2018/08/27 16:48:12 jsing Exp $ */
+/* $OpenBSD: s3_lib.c,v 1.170 2018/09/06 16:40:45 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
 * All rights reserved.
 *
@@ -674,7 +674,7 @@ SSL_CIPHER ssl3_ciphers[] = {
                .algorithm_ssl = SSL_TLSV1_2,
                .algo_strength = SSL_HIGH,
                .algorithm2 = SSL_HANDSHAKE_MAC_SHA256|TLS1_PRF_SHA256|
-                    SSL_CIPHER_ALGORITHM2_AEAD|FIXED_NONCE_LEN(4)|
+                    FIXED_NONCE_LEN(4)|
                    SSL_CIPHER_ALGORITHM2_VARIABLE_NONCE_IN_RECORD,
                .strength_bits = 128,
                .alg_bits = 128,
@@ -692,7 +692,7 @@ SSL_CIPHER ssl3_ciphers[] = {
                .algorithm_ssl = SSL_TLSV1_2,
                .algo_strength = SSL_HIGH,
                .algorithm2 = SSL_HANDSHAKE_MAC_SHA384|TLS1_PRF_SHA384|
-                    SSL_CIPHER_ALGORITHM2_AEAD|FIXED_NONCE_LEN(4)|
+                    FIXED_NONCE_LEN(4)|
                    SSL_CIPHER_ALGORITHM2_VARIABLE_NONCE_IN_RECORD,
                .strength_bits = 256,
                .alg_bits = 256,
@@ -710,7 +710,7 @@ SSL_CIPHER ssl3_ciphers[] = {
                .algorithm_ssl = SSL_TLSV1_2,
                .algo_strength = SSL_HIGH,
                .algorithm2 = SSL_HANDSHAKE_MAC_SHA256|TLS1_PRF_SHA256|
-                    SSL_CIPHER_ALGORITHM2_AEAD|FIXED_NONCE_LEN(4)|
+                    FIXED_NONCE_LEN(4)|
                    SSL_CIPHER_ALGORITHM2_VARIABLE_NONCE_IN_RECORD,
                .strength_bits = 128,
                .alg_bits = 128,
@@ -728,7 +728,7 @@ SSL_CIPHER ssl3_ciphers[] = {
                .algorithm_ssl = SSL_TLSV1_2,
                .algo_strength = SSL_HIGH,
                .algorithm2 = SSL_HANDSHAKE_MAC_SHA384|TLS1_PRF_SHA384|
-                    SSL_CIPHER_ALGORITHM2_AEAD|FIXED_NONCE_LEN(4)|
+                    FIXED_NONCE_LEN(4)|
                    SSL_CIPHER_ALGORITHM2_VARIABLE_NONCE_IN_RECORD,
                .strength_bits = 256,
                .alg_bits = 256,
@@ -746,7 +746,7 @@ SSL_CIPHER ssl3_ciphers[] = {
                .algorithm_ssl = SSL_TLSV1_2,
                .algo_strength = SSL_HIGH,
                .algorithm2 = SSL_HANDSHAKE_MAC_SHA256|TLS1_PRF_SHA256|
-                    SSL_CIPHER_ALGORITHM2_AEAD|FIXED_NONCE_LEN(4)|
+                    FIXED_NONCE_LEN(4)|
                    SSL_CIPHER_ALGORITHM2_VARIABLE_NONCE_IN_RECORD,
                .strength_bits = 128,
                .alg_bits = 128,
@@ -764,7 +764,7 @@ SSL_CIPHER ssl3_ciphers[] = {
                .algorithm_ssl = SSL_TLSV1_2,
                .algo_strength = SSL_HIGH,
                .algorithm2 = SSL_HANDSHAKE_MAC_SHA384|TLS1_PRF_SHA384|
-                    SSL_CIPHER_ALGORITHM2_AEAD|FIXED_NONCE_LEN(4)|
+                    FIXED_NONCE_LEN(4)|
                    SSL_CIPHER_ALGORITHM2_VARIABLE_NONCE_IN_RECORD,
                .strength_bits = 256,
                .alg_bits = 256,
@@ -1191,7 +1191,7 @@ SSL_CIPHER ssl3_ciphers[] = {
                .algorithm_ssl = SSL_TLSV1_2,
                .algo_strength = SSL_HIGH,
                .algorithm2 = SSL_HANDSHAKE_MAC_SHA256|TLS1_PRF_SHA256|
-                    SSL_CIPHER_ALGORITHM2_AEAD|FIXED_NONCE_LEN(4)|
+                    FIXED_NONCE_LEN(4)|
                    SSL_CIPHER_ALGORITHM2_VARIABLE_NONCE_IN_RECORD,
                .strength_bits = 128,
                .alg_bits = 128,
@@ -1209,7 +1209,7 @@ SSL_CIPHER ssl3_ciphers[] = {
                .algorithm_ssl = SSL_TLSV1_2,
                .algo_strength = SSL_HIGH,
                .algorithm2 = SSL_HANDSHAKE_MAC_SHA384|TLS1_PRF_SHA384|
-                    SSL_CIPHER_ALGORITHM2_AEAD|FIXED_NONCE_LEN(4)|
+                    FIXED_NONCE_LEN(4)|
                    SSL_CIPHER_ALGORITHM2_VARIABLE_NONCE_IN_RECORD,
                .strength_bits = 256,
                .alg_bits = 256,
@@ -1227,7 +1227,7 @@ SSL_CIPHER ssl3_ciphers[] = {
                .algorithm_ssl = SSL_TLSV1_2,
                .algo_strength = SSL_HIGH,
                .algorithm2 = SSL_HANDSHAKE_MAC_SHA256|TLS1_PRF_SHA256|
-                    SSL_CIPHER_ALGORITHM2_AEAD|FIXED_NONCE_LEN(4)|
+                    FIXED_NONCE_LEN(4)|
                    SSL_CIPHER_ALGORITHM2_VARIABLE_NONCE_IN_RECORD,
                .strength_bits = 128,
                .alg_bits = 128,
@@ -1245,7 +1245,7 @@ SSL_CIPHER ssl3_ciphers[] = {
                .algorithm_ssl = SSL_TLSV1_2,
                .algo_strength = SSL_HIGH,
                .algorithm2 = SSL_HANDSHAKE_MAC_SHA384|TLS1_PRF_SHA384|
-                    SSL_CIPHER_ALGORITHM2_AEAD|FIXED_NONCE_LEN(4)|
+                    FIXED_NONCE_LEN(4)|
                    SSL_CIPHER_ALGORITHM2_VARIABLE_NONCE_IN_RECORD,
                .strength_bits = 256,
                .alg_bits = 256,
@@ -1263,7 +1263,7 @@ SSL_CIPHER ssl3_ciphers[] = {
                .algorithm_ssl = SSL_TLSV1_2,
                .algo_strength = SSL_HIGH,
                .algorithm2 = SSL_HANDSHAKE_MAC_SHA256|TLS1_PRF_SHA256|
-                    SSL_CIPHER_ALGORITHM2_AEAD|FIXED_NONCE_LEN(12),
+                    FIXED_NONCE_LEN(12),
                .strength_bits = 256,
                .alg_bits = 256,
        },
@@ -1280,7 +1280,7 @@ SSL_CIPHER ssl3_ciphers[] = {
                .algorithm_ssl = SSL_TLSV1_2,
                .algo_strength = SSL_HIGH,
                .algorithm2 = SSL_HANDSHAKE_MAC_SHA256|TLS1_PRF_SHA256|
-                    SSL_CIPHER_ALGORITHM2_AEAD|FIXED_NONCE_LEN(12),
+                    FIXED_NONCE_LEN(12),
                .strength_bits = 256,
                .alg_bits = 256,
        },
@@ -1297,7 +1297,7 @@ SSL_CIPHER ssl3_ciphers[] = {
                .algorithm_ssl = SSL_TLSV1_2,
                .algo_strength = SSL_HIGH,
                .algorithm2 = SSL_HANDSHAKE_MAC_SHA256|TLS1_PRF_SHA256|
-                    SSL_CIPHER_ALGORITHM2_AEAD|FIXED_NONCE_LEN(12),
+                    FIXED_NONCE_LEN(12),
                .strength_bits = 256,
                .alg_bits = 256,
        },
author	jsing <>	2018-09-06 16:40:45 +0000
committer	jsing <>	2018-09-06 16:40:45 +0000
commit	72f73019933c7339b36a51b22acc8440b8608f61 (patch)
tree	e66e90f0f003a49e386ad0667b3e568deec4c31a /src/lib/libssl/s3_lib.c
parent	a267c63d946b543a11f0afc79e6a96b027035b7c (diff)
download	openbsd-72f73019933c7339b36a51b22acc8440b8608f61.tar.gz openbsd-72f73019933c7339b36a51b22acc8440b8608f61.tar.bz2 openbsd-72f73019933c7339b36a51b22acc8440b8608f61.zip

diff --git a/src/lib/libssl/s3_lib.c b/src/lib/libssl/s3_lib.c index 6e12bf9503..02e6c66a47 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.169 2018/08/27 16:48:12 jsing Exp $ */	1	/* $OpenBSD: s3_lib.c,v 1.170 2018/09/06 16:40:45 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	*
@@ -674,7 +674,7 @@ SSL_CIPHER ssl3_ciphers[] = {
674	.algorithm_ssl = SSL_TLSV1_2,	674	.algorithm_ssl = SSL_TLSV1_2,
675	.algo_strength = SSL_HIGH,	675	.algo_strength = SSL_HIGH,
676	.algorithm2 = SSL_HANDSHAKE_MAC_SHA256\|TLS1_PRF_SHA256\|	676	.algorithm2 = SSL_HANDSHAKE_MAC_SHA256\|TLS1_PRF_SHA256\|
677	SSL_CIPHER_ALGORITHM2_AEAD\|FIXED_NONCE_LEN(4)\|	677	FIXED_NONCE_LEN(4)\|
678	SSL_CIPHER_ALGORITHM2_VARIABLE_NONCE_IN_RECORD,	678	SSL_CIPHER_ALGORITHM2_VARIABLE_NONCE_IN_RECORD,
679	.strength_bits = 128,	679	.strength_bits = 128,
680	.alg_bits = 128,	680	.alg_bits = 128,
@@ -692,7 +692,7 @@ SSL_CIPHER ssl3_ciphers[] = {
692	.algorithm_ssl = SSL_TLSV1_2,	692	.algorithm_ssl = SSL_TLSV1_2,
693	.algo_strength = SSL_HIGH,	693	.algo_strength = SSL_HIGH,
694	.algorithm2 = SSL_HANDSHAKE_MAC_SHA384\|TLS1_PRF_SHA384\|	694	.algorithm2 = SSL_HANDSHAKE_MAC_SHA384\|TLS1_PRF_SHA384\|
695	SSL_CIPHER_ALGORITHM2_AEAD\|FIXED_NONCE_LEN(4)\|	695	FIXED_NONCE_LEN(4)\|
696	SSL_CIPHER_ALGORITHM2_VARIABLE_NONCE_IN_RECORD,	696	SSL_CIPHER_ALGORITHM2_VARIABLE_NONCE_IN_RECORD,
697	.strength_bits = 256,	697	.strength_bits = 256,
698	.alg_bits = 256,	698	.alg_bits = 256,
@@ -710,7 +710,7 @@ SSL_CIPHER ssl3_ciphers[] = {
710	.algorithm_ssl = SSL_TLSV1_2,	710	.algorithm_ssl = SSL_TLSV1_2,
711	.algo_strength = SSL_HIGH,	711	.algo_strength = SSL_HIGH,
712	.algorithm2 = SSL_HANDSHAKE_MAC_SHA256\|TLS1_PRF_SHA256\|	712	.algorithm2 = SSL_HANDSHAKE_MAC_SHA256\|TLS1_PRF_SHA256\|
713	SSL_CIPHER_ALGORITHM2_AEAD\|FIXED_NONCE_LEN(4)\|	713	FIXED_NONCE_LEN(4)\|
714	SSL_CIPHER_ALGORITHM2_VARIABLE_NONCE_IN_RECORD,	714	SSL_CIPHER_ALGORITHM2_VARIABLE_NONCE_IN_RECORD,
715	.strength_bits = 128,	715	.strength_bits = 128,
716	.alg_bits = 128,	716	.alg_bits = 128,
@@ -728,7 +728,7 @@ SSL_CIPHER ssl3_ciphers[] = {
728	.algorithm_ssl = SSL_TLSV1_2,	728	.algorithm_ssl = SSL_TLSV1_2,
729	.algo_strength = SSL_HIGH,	729	.algo_strength = SSL_HIGH,
730	.algorithm2 = SSL_HANDSHAKE_MAC_SHA384\|TLS1_PRF_SHA384\|	730	.algorithm2 = SSL_HANDSHAKE_MAC_SHA384\|TLS1_PRF_SHA384\|
731	SSL_CIPHER_ALGORITHM2_AEAD\|FIXED_NONCE_LEN(4)\|	731	FIXED_NONCE_LEN(4)\|
732	SSL_CIPHER_ALGORITHM2_VARIABLE_NONCE_IN_RECORD,	732	SSL_CIPHER_ALGORITHM2_VARIABLE_NONCE_IN_RECORD,
733	.strength_bits = 256,	733	.strength_bits = 256,
734	.alg_bits = 256,	734	.alg_bits = 256,
@@ -746,7 +746,7 @@ SSL_CIPHER ssl3_ciphers[] = {
746	.algorithm_ssl = SSL_TLSV1_2,	746	.algorithm_ssl = SSL_TLSV1_2,
747	.algo_strength = SSL_HIGH,	747	.algo_strength = SSL_HIGH,
748	.algorithm2 = SSL_HANDSHAKE_MAC_SHA256\|TLS1_PRF_SHA256\|	748	.algorithm2 = SSL_HANDSHAKE_MAC_SHA256\|TLS1_PRF_SHA256\|
749	SSL_CIPHER_ALGORITHM2_AEAD\|FIXED_NONCE_LEN(4)\|	749	FIXED_NONCE_LEN(4)\|
750	SSL_CIPHER_ALGORITHM2_VARIABLE_NONCE_IN_RECORD,	750	SSL_CIPHER_ALGORITHM2_VARIABLE_NONCE_IN_RECORD,
751	.strength_bits = 128,	751	.strength_bits = 128,
752	.alg_bits = 128,	752	.alg_bits = 128,
@@ -764,7 +764,7 @@ SSL_CIPHER ssl3_ciphers[] = {
764	.algorithm_ssl = SSL_TLSV1_2,	764	.algorithm_ssl = SSL_TLSV1_2,
765	.algo_strength = SSL_HIGH,	765	.algo_strength = SSL_HIGH,
766	.algorithm2 = SSL_HANDSHAKE_MAC_SHA384\|TLS1_PRF_SHA384\|	766	.algorithm2 = SSL_HANDSHAKE_MAC_SHA384\|TLS1_PRF_SHA384\|
767	SSL_CIPHER_ALGORITHM2_AEAD\|FIXED_NONCE_LEN(4)\|	767	FIXED_NONCE_LEN(4)\|
768	SSL_CIPHER_ALGORITHM2_VARIABLE_NONCE_IN_RECORD,	768	SSL_CIPHER_ALGORITHM2_VARIABLE_NONCE_IN_RECORD,
769	.strength_bits = 256,	769	.strength_bits = 256,
770	.alg_bits = 256,	770	.alg_bits = 256,
@@ -1191,7 +1191,7 @@ SSL_CIPHER ssl3_ciphers[] = {
1191	.algorithm_ssl = SSL_TLSV1_2,	1191	.algorithm_ssl = SSL_TLSV1_2,
1192	.algo_strength = SSL_HIGH,	1192	.algo_strength = SSL_HIGH,
1193	.algorithm2 = SSL_HANDSHAKE_MAC_SHA256\|TLS1_PRF_SHA256\|	1193	.algorithm2 = SSL_HANDSHAKE_MAC_SHA256\|TLS1_PRF_SHA256\|
1194	SSL_CIPHER_ALGORITHM2_AEAD\|FIXED_NONCE_LEN(4)\|	1194	FIXED_NONCE_LEN(4)\|
1195	SSL_CIPHER_ALGORITHM2_VARIABLE_NONCE_IN_RECORD,	1195	SSL_CIPHER_ALGORITHM2_VARIABLE_NONCE_IN_RECORD,
1196	.strength_bits = 128,	1196	.strength_bits = 128,
1197	.alg_bits = 128,	1197	.alg_bits = 128,
@@ -1209,7 +1209,7 @@ SSL_CIPHER ssl3_ciphers[] = {
1209	.algorithm_ssl = SSL_TLSV1_2,	1209	.algorithm_ssl = SSL_TLSV1_2,
1210	.algo_strength = SSL_HIGH,	1210	.algo_strength = SSL_HIGH,
1211	.algorithm2 = SSL_HANDSHAKE_MAC_SHA384\|TLS1_PRF_SHA384\|	1211	.algorithm2 = SSL_HANDSHAKE_MAC_SHA384\|TLS1_PRF_SHA384\|
1212	SSL_CIPHER_ALGORITHM2_AEAD\|FIXED_NONCE_LEN(4)\|	1212	FIXED_NONCE_LEN(4)\|
1213	SSL_CIPHER_ALGORITHM2_VARIABLE_NONCE_IN_RECORD,	1213	SSL_CIPHER_ALGORITHM2_VARIABLE_NONCE_IN_RECORD,
1214	.strength_bits = 256,	1214	.strength_bits = 256,
1215	.alg_bits = 256,	1215	.alg_bits = 256,
@@ -1227,7 +1227,7 @@ SSL_CIPHER ssl3_ciphers[] = {
1227	.algorithm_ssl = SSL_TLSV1_2,	1227	.algorithm_ssl = SSL_TLSV1_2,
1228	.algo_strength = SSL_HIGH,	1228	.algo_strength = SSL_HIGH,
1229	.algorithm2 = SSL_HANDSHAKE_MAC_SHA256\|TLS1_PRF_SHA256\|	1229	.algorithm2 = SSL_HANDSHAKE_MAC_SHA256\|TLS1_PRF_SHA256\|
1230	SSL_CIPHER_ALGORITHM2_AEAD\|FIXED_NONCE_LEN(4)\|	1230	FIXED_NONCE_LEN(4)\|
1231	SSL_CIPHER_ALGORITHM2_VARIABLE_NONCE_IN_RECORD,	1231	SSL_CIPHER_ALGORITHM2_VARIABLE_NONCE_IN_RECORD,
1232	.strength_bits = 128,	1232	.strength_bits = 128,
1233	.alg_bits = 128,	1233	.alg_bits = 128,
@@ -1245,7 +1245,7 @@ SSL_CIPHER ssl3_ciphers[] = {
1245	.algorithm_ssl = SSL_TLSV1_2,	1245	.algorithm_ssl = SSL_TLSV1_2,
1246	.algo_strength = SSL_HIGH,	1246	.algo_strength = SSL_HIGH,
1247	.algorithm2 = SSL_HANDSHAKE_MAC_SHA384\|TLS1_PRF_SHA384\|	1247	.algorithm2 = SSL_HANDSHAKE_MAC_SHA384\|TLS1_PRF_SHA384\|
1248	SSL_CIPHER_ALGORITHM2_AEAD\|FIXED_NONCE_LEN(4)\|	1248	FIXED_NONCE_LEN(4)\|
1249	SSL_CIPHER_ALGORITHM2_VARIABLE_NONCE_IN_RECORD,	1249	SSL_CIPHER_ALGORITHM2_VARIABLE_NONCE_IN_RECORD,
1250	.strength_bits = 256,	1250	.strength_bits = 256,
1251	.alg_bits = 256,	1251	.alg_bits = 256,
@@ -1263,7 +1263,7 @@ SSL_CIPHER ssl3_ciphers[] = {
1263	.algorithm_ssl = SSL_TLSV1_2,	1263	.algorithm_ssl = SSL_TLSV1_2,
1264	.algo_strength = SSL_HIGH,	1264	.algo_strength = SSL_HIGH,
1265	.algorithm2 = SSL_HANDSHAKE_MAC_SHA256\|TLS1_PRF_SHA256\|	1265	.algorithm2 = SSL_HANDSHAKE_MAC_SHA256\|TLS1_PRF_SHA256\|
1266	SSL_CIPHER_ALGORITHM2_AEAD\|FIXED_NONCE_LEN(12),	1266	FIXED_NONCE_LEN(12),
1267	.strength_bits = 256,	1267	.strength_bits = 256,
1268	.alg_bits = 256,	1268	.alg_bits = 256,
1269	},	1269	},
@@ -1280,7 +1280,7 @@ SSL_CIPHER ssl3_ciphers[] = {
1280	.algorithm_ssl = SSL_TLSV1_2,	1280	.algorithm_ssl = SSL_TLSV1_2,
1281	.algo_strength = SSL_HIGH,	1281	.algo_strength = SSL_HIGH,
1282	.algorithm2 = SSL_HANDSHAKE_MAC_SHA256\|TLS1_PRF_SHA256\|	1282	.algorithm2 = SSL_HANDSHAKE_MAC_SHA256\|TLS1_PRF_SHA256\|
1283	SSL_CIPHER_ALGORITHM2_AEAD\|FIXED_NONCE_LEN(12),	1283	FIXED_NONCE_LEN(12),
1284	.strength_bits = 256,	1284	.strength_bits = 256,
1285	.alg_bits = 256,	1285	.alg_bits = 256,
1286	},	1286	},
@@ -1297,7 +1297,7 @@ SSL_CIPHER ssl3_ciphers[] = {
1297	.algorithm_ssl = SSL_TLSV1_2,	1297	.algorithm_ssl = SSL_TLSV1_2,
1298	.algo_strength = SSL_HIGH,	1298	.algo_strength = SSL_HIGH,
1299	.algorithm2 = SSL_HANDSHAKE_MAC_SHA256\|TLS1_PRF_SHA256\|	1299	.algorithm2 = SSL_HANDSHAKE_MAC_SHA256\|TLS1_PRF_SHA256\|
1300	SSL_CIPHER_ALGORITHM2_AEAD\|FIXED_NONCE_LEN(12),	1300	FIXED_NONCE_LEN(12),
1301	.strength_bits = 256,	1301	.strength_bits = 256,
1302	.alg_bits = 256,	1302	.alg_bits = 256,
1303	},	1303	},