OERV-RUNTIME/boringssl
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Move common code between two branches.

Browse Source 
Some follow-up cleanup to bd30f8e34a.

Change-Id: Id996c6c43f42f4db410e1e612ee1e5e8e0233356
Reviewed-on: https://boringssl-review.googlesource.com/1569
Reviewed-by: Adam Langley <agl@google.com>
This commit is contained in:
David Benjamin
2014-08-20 19:05:02 +00:00
committed by Adam Langley
parent 422d3a4015
commit b52e3dded2
2 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ssl/d1_srvr.c
+6 -5
View File
@@ -494,10 +494,14 @@ int dtls1_accept(SSL *s)
ret=ssl3_get_client_key_exchange(s);
if (ret <= 0)
goto end;
s->state=SSL3_ST_SR_CERT_VRFY_A;
s->init_num=0;
/* TODO(davidben): These two blocks are different
* between SSL and DTLS. Resolve the difference and code
* duplication. */
if (SSL_USE_SIGALGS(s))
{
s->state=SSL3_ST_SR_CERT_VRFY_A;
s->init_num=0;
if (!s->session->peer)
break;
/* For sigalgs freeze the handshake buffer
@@ -514,9 +518,6 @@ int dtls1_accept(SSL *s)
}
else
{
s->state=SSL3_ST_SR_CERT_VRFY_A;
s->init_num=0;
/* We need to get hashes here so if there is
* a client cert, it can be verified */
s->method->ssl3_enc->cert_verify_mac(s,
ssl/s3_srvr.c
+6 -5
View File
@@ -492,10 +492,14 @@ int ssl3_accept(SSL *s)
ret=ssl3_get_client_key_exchange(s);
if (ret <= 0)
goto end;
s->state=SSL3_ST_SR_CERT_VRFY_A;
s->init_num=0;
/* TODO(davidben): These two blocks are different
* between SSL and DTLS. Resolve the difference and code
* duplication. */
if (SSL_USE_SIGALGS(s))
{
s->state=SSL3_ST_SR_CERT_VRFY_A;
s->init_num=0;
if (!s->session->peer)
break;
/* For sigalgs freeze the handshake buffer
@@ -515,9 +519,6 @@ int ssl3_accept(SSL *s)
int offset=0;
int dgst_num;
s->state=SSL3_ST_SR_CERT_VRFY_A;
s->init_num=0;
/* We need to get hashes here so if there is
* a client cert, it can be verified
* FIXME - digest processing for CertificateVerify