The branch master has been updated
via 52eede5a970fdb30c4ed6d3663e51f36bd1b1c73 (commit)
from fb9339827bfba3e70719d245e905a22101010678 (commit)
- Log -----------------------------------------------------------------
commit 52eede5a970fdb30c4ed6d3663e51f36bd1b1c73
Author: Dr. Stephen Henson <[email protected]>
Date: Tue Jul 19 16:03:10 2016 +0100
Sanity check in ssl_get_algorithm2().
RT#4600
Reviewed-by: Rich Salz <[email protected]>
-----------------------------------------------------------------------
Summary of changes:
ssl/s3_lib.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/ssl/s3_lib.c b/ssl/s3_lib.c
index 8218c2f..9158f21 100644
--- a/ssl/s3_lib.c
+++ b/ssl/s3_lib.c
@@ -3882,7 +3882,10 @@ int ssl3_renegotiate_check(SSL *s)
*/
long ssl_get_algorithm2(SSL *s)
{
- long alg2 = s->s3->tmp.new_cipher->algorithm2;
+ long alg2;
+ if (s->s3 == NULL || s->s3->tmp.new_cipher == NULL)
+ return -1;
+ alg2 = s->s3->tmp.new_cipher->algorithm2;
if (s->method->ssl3_enc->enc_flags & SSL_ENC_FLAG_SHA256_PRF) {
if (alg2 == (SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF))
return SSL_HANDSHAKE_MAC_SHA256 | TLS1_PRF_SHA256;
_____
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
