From 72257204bd2a88773461150765dfd0e0a428ee86 Mon Sep 17 00:00:00 2001 From: Matt Caswell Date: Wed, 21 Jun 2017 12:17:30 +0100 Subject: PSK related tweaks based on review feedback Reviewed-by: Rich Salz (Merged from https://github.com/openssl/openssl/pull/3670) --- ssl/ssl_ciph.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'ssl/ssl_ciph.c') diff --git a/ssl/ssl_ciph.c b/ssl/ssl_ciph.c index 0afdfdaba1..64bb264b52 100644 --- a/ssl/ssl_ciph.c +++ b/ssl/ssl_ciph.c @@ -1933,9 +1933,8 @@ int SSL_CIPHER_get_auth_nid(const SSL_CIPHER *c) const EVP_MD *SSL_CIPHER_get_handshake_digest(const SSL_CIPHER *c) { - int idx = c->algorithm2; + int idx = c->algorithm2 & SSL_HANDSHAKE_MAC_MASK; - idx &= SSL_HANDSHAKE_MAC_MASK; if (idx < 0 || idx >= SSL_MD_NUM_IDX) return NULL; return ssl_digest_methods[idx]; -- cgit v1.2.3