summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Benjamin <davidben@chromium.org>2014-11-01 04:23:19 -0400
committerAdam Langley <agl@google.com>2014-11-04 00:25:13 +0000
commitbe700c6328157c722cbfe96b08a39a8e71b05d07 (patch)
tree330c0f47f4ab23e9e247648b34a9dc3f29d68a64
parent2ae77d2784b4080afa65575fb101de76fc5cef52 (diff)
downloadsrc-be700c6328157c722cbfe96b08a39a8e71b05d07.tar.gz
Remove remnant of MS SGC second ClientHello.
This code was dead as ssl3_get_client_certificate no longer allows a ClientHello; the hash would be reset, but then the handshake would fail anyway. Change-Id: Ib98e6a319c048c263d7ee3a27832ea57bdd0e2ad Reviewed-on: https://boringssl-review.googlesource.com/2120 Reviewed-by: Adam Langley <agl@google.com>
-rw-r--r--ssl/s3_both.c12
1 files changed, 0 insertions, 12 deletions
diff --git a/ssl/s3_both.c b/ssl/s3_both.c
index bbdeadb..65eb3ba 100644
--- a/ssl/s3_both.c
+++ b/ssl/s3_both.c
@@ -419,18 +419,6 @@ long ssl3_get_message(SSL *s, int st1, int stn, int mt, long max, int hash_messa
OPENSSL_PUT_ERROR(SSL, ssl3_get_message, SSL_R_UNEXPECTED_MESSAGE);
goto f_err;
}
- if ((mt < 0) && (*p == SSL3_MT_CLIENT_HELLO) &&
- (st1 == SSL3_ST_SR_CERT_A) &&
- (stn == SSL3_ST_SR_CERT_B))
- {
- /* At this point we have got an MS SGC second client
- * hello (maybe we should always allow the client to
- * start a new handshake?). We need to restart the mac.
- * Don't increment {num,total}_renegotiations because
- * we have not completed the handshake. */
- ssl3_init_finished_mac(s);
- }
-
s->s3->tmp.message_type= *(p++);
n2l3(p,l);