diff options
Diffstat (limited to 'src/lib/libssl/s3_both.c')
-rw-r--r-- | src/lib/libssl/s3_both.c | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/src/lib/libssl/s3_both.c b/src/lib/libssl/s3_both.c index 633bf5bb7b..d9484d77d8 100644 --- a/src/lib/libssl/s3_both.c +++ b/src/lib/libssl/s3_both.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: s3_both.c,v 1.38 2015/03/27 12:29:54 jsing Exp $ */ | 1 | /* $OpenBSD: s3_both.c,v 1.39 2015/06/18 22:51:05 doug Exp $ */ |
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
@@ -450,20 +450,6 @@ ssl3_get_message(SSL *s, int st1, int stn, int mt, long max, int *ok) | |||
450 | SSLerr(SSL_F_SSL3_GET_MESSAGE, SSL_R_UNEXPECTED_MESSAGE); | 450 | SSLerr(SSL_F_SSL3_GET_MESSAGE, SSL_R_UNEXPECTED_MESSAGE); |
451 | goto f_err; | 451 | goto f_err; |
452 | } | 452 | } |
453 | if ((mt < 0) && (*p == SSL3_MT_CLIENT_HELLO) && | ||
454 | (st1 == SSL3_ST_SR_CERT_A) && (stn == SSL3_ST_SR_CERT_B)) { | ||
455 | /* At this point we have got an MS SGC second client | ||
456 | * hello (maybe we should always allow the client to | ||
457 | * start a new handshake?). We need to restart the mac. | ||
458 | * Don't increment {num,total}_renegotiations because | ||
459 | * we have not completed the handshake. */ | ||
460 | if (!ssl3_init_finished_mac(s)) { | ||
461 | SSLerr(SSL_F_SSL3_GET_MESSAGE, | ||
462 | ERR_R_MALLOC_FAILURE); | ||
463 | goto err; | ||
464 | } | ||
465 | } | ||
466 | |||
467 | s->s3->tmp.message_type= *(p++); | 453 | s->s3->tmp.message_type= *(p++); |
468 | 454 | ||
469 | n2l3(p, l); | 455 | n2l3(p, l); |