diff options
| author | Matt Caswell <matt@openssl.org> | 2020-01-16 12:14:27 +0000 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2020-02-06 11:59:07 +0000 |
| commit | c8f6c28a938fc887ee3d2337f09db453e7fb0369 (patch) | |
| tree | 80fab6c444adfb668fa03edc2297b729757b53c9 /ssl/statem/extensions_srvr.c | |
| parent | 8b6ffd40401bd3b78538cb8d496db0c6926185b0 (diff) | |
Explicitly fetch ciphers and digests in libssl
We modify libssl to use explicitly fetched ciphers, digests and other
algorithms as required based on the configured library context and
property query string for the SSL_CTX that is being used.
Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/10854)
Diffstat (limited to 'ssl/statem/extensions_srvr.c')
| -rw-r--r-- | ssl/statem/extensions_srvr.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/ssl/statem/extensions_srvr.c b/ssl/statem/extensions_srvr.c index a2a4ae8a6e..999e1cd832 100644 --- a/ssl/statem/extensions_srvr.c +++ b/ssl/statem/extensions_srvr.c @@ -1238,8 +1238,9 @@ int tls_parse_ctos_psk(SSL *s, PACKET *pkt, unsigned int context, X509 *x, } } - md = ssl_md(sess->cipher->algorithm2); - if (md != ssl_md(s->s3.tmp.new_cipher->algorithm2)) { + md = ssl_md(s->ctx, sess->cipher->algorithm2); + if (!EVP_MD_is_a(md, + EVP_MD_name(ssl_md(s->ctx, s->s3.tmp.new_cipher->algorithm2)))) { /* The ciphersuite is not compatible with this session. */ SSL_SESSION_free(sess); sess = NULL; |