diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2014-01-07 15:37:35 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2014-01-07 15:39:21 +0000 |
| commit | 8d65fdb62e517281350372775b5f93fcc8489681 (patch) | |
| tree | a829b3b789352f38f94ee8618716bdd2639acd49 /ssl/s3_both.c | |
| parent | 9bd1e2b54abfe9c28cb84a37039a09cb41c59952 (diff) | |
| download | openssl-new-8d65fdb62e517281350372775b5f93fcc8489681.tar.gz | |
Add fix for CVE-2013-4353
(cherry picked from commit 6b42ed4e7104898f4b5b69337589719913b36404)
Diffstat (limited to 'ssl/s3_both.c')
| -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 8de149aaa6..0a259b1f4f 100644 --- a/ssl/s3_both.c +++ b/ssl/s3_both.c @@ -203,7 +203,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; |