diff options
| author | Matt Caswell <matt@openssl.org> | 2017-01-19 15:01:55 +0000 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2017-01-30 10:18:22 +0000 |
| commit | 534a43ffeaec03e50768ccf84d431f96f11256e3 (patch) | |
| tree | b13507098f77003ce9bbb64955ec8b0b38918462 /ssl/ssl_ciph.c | |
| parent | 4086b42b2d58773bee8463f69eee4bf8c299b589 (diff) | |
| download | openssl-534a43ffeaec03e50768ccf84d431f96f11256e3.zip openssl-534a43ffeaec03e50768ccf84d431f96f11256e3.tar.gz openssl-534a43ffeaec03e50768ccf84d431f96f11256e3.tar.bz2 | |
Always ensure that session->cipher is set
If we have deserialized the SSL_SESSION then in some circumstances the
session->cipher value is NULL. We were patching up in some places but not
in others. We should just do it as part of loading the SSL_SESSION.
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2259)
Diffstat (limited to 'ssl/ssl_ciph.c')
| -rw-r--r-- | ssl/ssl_ciph.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/ssl/ssl_ciph.c b/ssl/ssl_ciph.c index d4145ba..88b99cc 100644 --- a/ssl/ssl_ciph.c +++ b/ssl/ssl_ciph.c @@ -2018,14 +2018,3 @@ int ssl_cipher_get_overhead(const SSL_CIPHER *c, size_t *mac_overhead, return 1; } - -const EVP_MD *ssl_cipher_get_handshake_md(int cipher_id) -{ - const SSL_CIPHER *cipher = ssl3_get_cipher_by_id(cipher_id); - if (cipher == NULL) { - /* Don't recognise this cipher */ - return NULL; - } - - return ssl_md(cipher->algorithm2); -} |