diff options
| author | Matt Caswell <matt@openssl.org> | 2017-06-21 12:17:30 +0100 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2017-06-21 14:45:36 +0100 |
| commit | 72257204bd2a88773461150765dfd0e0a428ee86 (patch) | |
| tree | 0f62189accc00c2b1e58de678a7e56c1a8748325 /ssl/ssl_ciph.c | |
| parent | adfc37868e2dc406b80ab3111163eb475ef06975 (diff) | |
| download | openssl-72257204bd2a88773461150765dfd0e0a428ee86.zip openssl-72257204bd2a88773461150765dfd0e0a428ee86.tar.gz openssl-72257204bd2a88773461150765dfd0e0a428ee86.tar.bz2 | |
PSK related tweaks based on review feedback
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3670)
Diffstat (limited to 'ssl/ssl_ciph.c')
| -rw-r--r-- | ssl/ssl_ciph.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/ssl/ssl_ciph.c b/ssl/ssl_ciph.c index 0afdfda..64bb264 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]; |