diff options
| author | tb <> | 2024-05-09 07:55:48 +0000 |
|---|---|---|
| committer | tb <> | 2024-05-09 07:55:48 +0000 |
| commit | 695cc72a374d931d52dbfd31e18102acae2969cf (patch) | |
| tree | 7cf0c4186359daa935e5ba94439955b9f39250fd /src | |
| parent | ef3fdc7ca030406f952286ee94a6e2145899eb83 (diff) | |
| download | openbsd-695cc72a374d931d52dbfd31e18102acae2969cf.tar.gz openbsd-695cc72a374d931d52dbfd31e18102acae2969cf.tar.bz2 openbsd-695cc72a374d931d52dbfd31e18102acae2969cf.zip | |
ssl_ciph.c: unwrap a line
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/libssl/ssl_ciph.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/lib/libssl/ssl_ciph.c b/src/lib/libssl/ssl_ciph.c index 4bcd0dbba4..a01465d9e0 100644 --- a/src/lib/libssl/ssl_ciph.c +++ b/src/lib/libssl/ssl_ciph.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: ssl_ciph.c,v 1.141 2024/05/09 07:47:50 tb Exp $ */ | 1 | /* $OpenBSD: ssl_ciph.c,v 1.142 2024/05/09 07:55:48 tb 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 | * |
| @@ -522,8 +522,7 @@ ssl_get_handshake_evp_md(SSL *s, const EVP_MD **md) | |||
| 522 | if (s->s3->hs.cipher == NULL) | 522 | if (s->s3->hs.cipher == NULL) |
| 523 | return 0; | 523 | return 0; |
| 524 | 524 | ||
| 525 | handshake_mac = s->s3->hs.cipher->algorithm2 & | 525 | handshake_mac = s->s3->hs.cipher->algorithm2 & SSL_HANDSHAKE_MAC_MASK; |
| 526 | SSL_HANDSHAKE_MAC_MASK; | ||
| 527 | 526 | ||
| 528 | /* For TLSv1.2 we upgrade the default MD5+SHA1 MAC to SHA256. */ | 527 | /* For TLSv1.2 we upgrade the default MD5+SHA1 MAC to SHA256. */ |
| 529 | if (SSL_USE_SHA256_PRF(s) && handshake_mac == SSL_HANDSHAKE_MAC_DEFAULT) | 528 | if (SSL_USE_SHA256_PRF(s) && handshake_mac == SSL_HANDSHAKE_MAC_DEFAULT) |