diff options
| author |   guenther <guenther@openbsd.org> | 2015-05-25 21:35:35 +0000 |
|---|---|---|
| committer | guenther <guenther@openbsd.org> | 2015-05-25 21:35:35 +0000 |
| commit | 7d8ef580a120c624a3e7028a6f7fcd884b09c73c (patch) | |
| tree | c7c17d6133dc652c46b4f636e139b21bd4b83aa2 /lib/libssl/src | |
| parent | Skip search domains iteration if RES_DNSRCH and/or RES_DEFNAMES is unset. (diff) | |
| download | wireguard-openbsd-7d8ef580a120c624a3e7028a6f7fcd884b09c73c.tar.xz wireguard-openbsd-7d8ef580a120c624a3e7028a6f7fcd884b09c73c.zip | |
Make SSL_CIPHER_get_bits() report ChaCha20-Poly1305 ciphers as using
256bit keys
problem noted by Tim Kuijsten (info (at) netsend.nl)
ok deraadt@ miod@ bcook@
Diffstat (limited to 'lib/libssl/src')
| -rw-r--r-- | lib/libssl/src/ssl/s3_lib.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/libssl/src/ssl/s3_lib.c b/lib/libssl/src/ssl/s3_lib.c index c6062934dc1..79f680f527e 100644 --- a/lib/libssl/src/ssl/s3_lib.c +++ b/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 |