2 files changed, 8 insertions, 8 deletions
diff --git a/src/lib/libssl/s3_lib.c b/src/lib/libssl/s3_lib.c
index c6062934dc..79f680f527 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.95 2015/02/08 22:06:49 miod Exp $ */
+/* $OpenBSD: s3_lib.c,v 1.96 2015/05/25 21:35:35 guenther Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
 * All rights reserved.
 *
@@ -1820,7 +1820,7 @@ SSL_CIPHER ssl3_ciphers[] = {
                .algorithm2 = SSL_HANDSHAKE_MAC_SHA256|TLS1_PRF_SHA256|
                    SSL_CIPHER_ALGORITHM2_AEAD|FIXED_NONCE_LEN(0),
                .strength_bits = 256,
-                .alg_bits = 0,
+                .alg_bits = 256,
        },
        /* Cipher CC14 */
@@ -1837,7 +1837,7 @@ SSL_CIPHER ssl3_ciphers[] = {
                .algorithm2 = SSL_HANDSHAKE_MAC_SHA256|TLS1_PRF_SHA256|
                    SSL_CIPHER_ALGORITHM2_AEAD|FIXED_NONCE_LEN(0),
                .strength_bits = 256,
-                .alg_bits = 0,
+                .alg_bits = 256,
        },
        /* Cipher CC15 */
@@ -1854,7 +1854,7 @@ SSL_CIPHER ssl3_ciphers[] = {
                .algorithm2 = SSL_HANDSHAKE_MAC_SHA256|TLS1_PRF_SHA256|
                    SSL_CIPHER_ALGORITHM2_AEAD|FIXED_NONCE_LEN(0),
                .strength_bits = 256,
-                .alg_bits = 0,
+                .alg_bits = 256,
        },
 #endif
diff --git a/src/lib/libssl/src/ssl/s3_lib.c b/src/lib/libssl/src/ssl/s3_lib.c
index c6062934dc..79f680f527 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.95 2015/02/08 22:06:49 miod Exp $ */
+/* $OpenBSD: s3_lib.c,v 1.96 2015/05/25 21:35:35 guenther Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
 * All rights reserved.
 *
@@ -1820,7 +1820,7 @@ SSL_CIPHER ssl3_ciphers[] = {
                .algorithm2 = SSL_HANDSHAKE_MAC_SHA256|TLS1_PRF_SHA256|
                    SSL_CIPHER_ALGORITHM2_AEAD|FIXED_NONCE_LEN(0),
                .strength_bits = 256,
-                .alg_bits = 0,
+                .alg_bits = 256,
        },
        /* Cipher CC14 */
@@ -1837,7 +1837,7 @@ SSL_CIPHER ssl3_ciphers[] = {
                .algorithm2 = SSL_HANDSHAKE_MAC_SHA256|TLS1_PRF_SHA256|
                    SSL_CIPHER_ALGORITHM2_AEAD|FIXED_NONCE_LEN(0),
                .strength_bits = 256,
-                .alg_bits = 0,
+                .alg_bits = 256,
        },
        /* Cipher CC15 */
@@ -1854,7 +1854,7 @@ SSL_CIPHER ssl3_ciphers[] = {
                .algorithm2 = SSL_HANDSHAKE_MAC_SHA256|TLS1_PRF_SHA256|
                    SSL_CIPHER_ALGORITHM2_AEAD|FIXED_NONCE_LEN(0),
                .strength_bits = 256,
-                .alg_bits = 0,
+                .alg_bits = 256,
        },
 #endif

diff --git a/src/lib/libssl/s3_lib.c b/src/lib/libssl/s3_lib.c index c6062934dc..79f680f527 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.95 2015/02/08 22:06:49 miod Exp $ */	1	/* $OpenBSD: s3_lib.c,v 1.96 2015/05/25 21:35:35 guenther 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	*
@@ -1820,7 +1820,7 @@ SSL_CIPHER ssl3_ciphers[] = {
1820	.algorithm2 = SSL_HANDSHAKE_MAC_SHA256\|TLS1_PRF_SHA256\|	1820	.algorithm2 = SSL_HANDSHAKE_MAC_SHA256\|TLS1_PRF_SHA256\|
1821	SSL_CIPHER_ALGORITHM2_AEAD\|FIXED_NONCE_LEN(0),	1821	SSL_CIPHER_ALGORITHM2_AEAD\|FIXED_NONCE_LEN(0),
1822	.strength_bits = 256,	1822	.strength_bits = 256,
1823	.alg_bits = 0,	1823	.alg_bits = 256,
1824	},	1824	},
1825		1825
1826	/* Cipher CC14 */	1826	/* Cipher CC14 */
@@ -1837,7 +1837,7 @@ SSL_CIPHER ssl3_ciphers[] = {
1837	.algorithm2 = SSL_HANDSHAKE_MAC_SHA256\|TLS1_PRF_SHA256\|	1837	.algorithm2 = SSL_HANDSHAKE_MAC_SHA256\|TLS1_PRF_SHA256\|
1838	SSL_CIPHER_ALGORITHM2_AEAD\|FIXED_NONCE_LEN(0),	1838	SSL_CIPHER_ALGORITHM2_AEAD\|FIXED_NONCE_LEN(0),
1839	.strength_bits = 256,	1839	.strength_bits = 256,
1840	.alg_bits = 0,	1840	.alg_bits = 256,
1841	},	1841	},
1842		1842
1843	/* Cipher CC15 */	1843	/* Cipher CC15 */
@@ -1854,7 +1854,7 @@ SSL_CIPHER ssl3_ciphers[] = {
1854	.algorithm2 = SSL_HANDSHAKE_MAC_SHA256\|TLS1_PRF_SHA256\|	1854	.algorithm2 = SSL_HANDSHAKE_MAC_SHA256\|TLS1_PRF_SHA256\|
1855	SSL_CIPHER_ALGORITHM2_AEAD\|FIXED_NONCE_LEN(0),	1855	SSL_CIPHER_ALGORITHM2_AEAD\|FIXED_NONCE_LEN(0),
1856	.strength_bits = 256,	1856	.strength_bits = 256,
1857	.alg_bits = 0,	1857	.alg_bits = 256,
1858	},	1858	},
1859	#endif	1859	#endif
1860		1860


diff --git a/src/lib/libssl/src/ssl/s3_lib.c b/src/lib/libssl/src/ssl/s3_lib.c index c6062934dc..79f680f527 100644 --- a/src/lib/libssl/src/ssl/s3_lib.c +++ b/src/lib/libssl/src/ssl/s3_lib.c
@@ -1,4 +1,4 @@
1	/* $OpenBSD: s3_lib.c,v 1.95 2015/02/08 22:06:49 miod Exp $ */	1	/* $OpenBSD: s3_lib.c,v 1.96 2015/05/25 21:35:35 guenther 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	*
@@ -1820,7 +1820,7 @@ SSL_CIPHER ssl3_ciphers[] = {
1820	.algorithm2 = SSL_HANDSHAKE_MAC_SHA256\|TLS1_PRF_SHA256\|	1820	.algorithm2 = SSL_HANDSHAKE_MAC_SHA256\|TLS1_PRF_SHA256\|
1821	SSL_CIPHER_ALGORITHM2_AEAD\|FIXED_NONCE_LEN(0),	1821	SSL_CIPHER_ALGORITHM2_AEAD\|FIXED_NONCE_LEN(0),
1822	.strength_bits = 256,	1822	.strength_bits = 256,
1823	.alg_bits = 0,	1823	.alg_bits = 256,
1824	},	1824	},
1825		1825
1826	/* Cipher CC14 */	1826	/* Cipher CC14 */
@@ -1837,7 +1837,7 @@ SSL_CIPHER ssl3_ciphers[] = {
1837	.algorithm2 = SSL_HANDSHAKE_MAC_SHA256\|TLS1_PRF_SHA256\|	1837	.algorithm2 = SSL_HANDSHAKE_MAC_SHA256\|TLS1_PRF_SHA256\|
1838	SSL_CIPHER_ALGORITHM2_AEAD\|FIXED_NONCE_LEN(0),	1838	SSL_CIPHER_ALGORITHM2_AEAD\|FIXED_NONCE_LEN(0),
1839	.strength_bits = 256,	1839	.strength_bits = 256,
1840	.alg_bits = 0,	1840	.alg_bits = 256,
1841	},	1841	},
1842		1842
1843	/* Cipher CC15 */	1843	/* Cipher CC15 */
@@ -1854,7 +1854,7 @@ SSL_CIPHER ssl3_ciphers[] = {
1854	.algorithm2 = SSL_HANDSHAKE_MAC_SHA256\|TLS1_PRF_SHA256\|	1854	.algorithm2 = SSL_HANDSHAKE_MAC_SHA256\|TLS1_PRF_SHA256\|
1855	SSL_CIPHER_ALGORITHM2_AEAD\|FIXED_NONCE_LEN(0),	1855	SSL_CIPHER_ALGORITHM2_AEAD\|FIXED_NONCE_LEN(0),
1856	.strength_bits = 256,	1856	.strength_bits = 256,
1857	.alg_bits = 0,	1857	.alg_bits = 256,
1858	},	1858	},
1859	#endif	1859	#endif
1860		1860