diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2014-01-06 14:35:04 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2014-01-06 14:35:04 +0000 |
| commit | 197e0ea817ad64820789d86711d55ff50d71f631 (patch) | |
| tree | f22cdea104aee6d013f40847f4e712280820d02a /ssl | |
| parent | c776a3f398b1fd0d59e9247c0c4c6b79f5692b33 (diff) | |
Fix for TLS record tampering bug CVE-2013-4353
Diffstat (limited to 'ssl')
| -rw-r--r-- | ssl/s3_both.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/ssl/s3_both.c b/ssl/s3_both.c index 1e5dcab7d3..53b9390fdd 100644 --- a/ssl/s3_both.c +++ b/ssl/s3_both.c @@ -210,7 +210,11 @@ static void ssl3_take_mac(SSL *s) { const char *sender; int slen; - + /* If no new cipher setup return immediately: other functions will + * set the appropriate error. + */ + if (s->s3->tmp.new_cipher == NULL) + return; if (s->state & SSL_ST_CONNECT) { sender=s->method->ssl3_enc->server_finished_label; |