diff options
| author |   guenther <guenther@openbsd.org> | 2020-10-11 12:45:51 +0000 |
|---|---|---|
| committer | guenther <guenther@openbsd.org> | 2020-10-11 12:45:51 +0000 |
| commit | 1d2a9be251ec81a5f71561a049367a866b78909a (patch) | |
| tree | f9cfc892f36ca991a8c9a84e295ecbcfe5a09a33 /lib/libssl/s3_lib.c | |
| parent | Implement more of RFC 8630 and support more than one URI in the TAL file. (diff) | |
| download | wireguard-openbsd-1d2a9be251ec81a5f71561a049367a866b78909a.tar.xz wireguard-openbsd-1d2a9be251ec81a5f71561a049367a866b78909a.zip | |
SSL3_ENC_METHOD is just a flag word; merge it into SSL_METHOD_INTERNAL
with #defines for the per-version initializers instead of extern
globals. Add SSL_USE_SHA256_PRF() to complete the abstraction.
ok tb@ jsing@
Diffstat (limited to 'lib/libssl/s3_lib.c')
| -rw-r--r-- | lib/libssl/s3_lib.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/libssl/s3_lib.c b/lib/libssl/s3_lib.c index 01afc72ebd3..3bd7d65522d 100644 --- a/lib/libssl/s3_lib.c +++ b/lib/libssl/s3_lib.c @@ -1,4 +1,4 @@ -/* $OpenBSD: s3_lib.c,v 1.199 2020/10/11 01:13:04 guenther Exp $ */ +/* $OpenBSD: s3_lib.c,v 1.200 2020/10/11 12:45:51 guenther Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -2731,7 +2731,7 @@ ssl_get_algorithm2(SSL *s) { long alg2 = S3I(s)->hs.new_cipher->algorithm2; - if (s->method->internal->ssl3_enc->enc_flags & SSL_ENC_FLAG_SHA256_PRF && + if (SSL_USE_SHA256_PRF(s) && alg2 == (SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF)) return SSL_HANDSHAKE_MAC_SHA256 | TLS1_PRF_SHA256; return alg2; |