kris/boringssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Minor formatting fixes.

Browse Source 
Noticed these as I was poking around.

Change-Id: I93833a152583feced374c9febf7485bec7abc1c7
Reviewed-on: https://boringssl-review.googlesource.com/3973
Reviewed-by: Adam Langley <agl@google.com>
This commit is contained in:
David Benjamin 2015-03-14 01:54:17 -04:00 committed by Adam Langley
parent 9e13e1a31d
commit 8b368412d3
3 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ssl/s3_both.c
View File

@ -173,8 +173,7 @@ int ssl3_send_finished(SSL *s, int a, int b, const char *sender, int slen) {
return 0; return 0;
} }
/* Copy the finished so we can use it for /* Copy the finished so we can use it for renegotiation checks */
* renegotiation checks */
if (s->server) { if (s->server) {
assert(n <= EVP_MAX_MD_SIZE); assert(n <= EVP_MAX_MD_SIZE);
memcpy(s->s3->previous_server_finished, s->s3->tmp.finish_md, n); memcpy(s->s3->previous_server_finished, s->s3->tmp.finish_md, n);

8
ssl/s3_clnt.c
View File

@ -390,12 +390,8 @@ int ssl3_connect(SSL *s) {
s->init_num = 0; s->init_num = 0;
s->session->cipher = s->s3->tmp.new_cipher; s->session->cipher = s->s3->tmp.new_cipher;
if (!s->enc_method->setup_key_block(s)) { if (!s->enc_method->setup_key_block(s) ||
ret = -1; !s->enc_method->change_cipher_state(
goto end;
}
if (!s->enc_method->change_cipher_state(
s, SSL3_CHANGE_CIPHER_CLIENT_WRITE)) { s, SSL3_CHANGE_CIPHER_CLIENT_WRITE)) {
ret = -1; ret = -1;
goto end; goto end;

2
ssl/test/bssl_shim.cc
View File

@ -204,7 +204,7 @@ static int NextProtosAdvertisedCallback(SSL *ssl, const uint8_t **out,
} }
static int NextProtoSelectCallback(SSL* ssl, uint8_t** out, uint8_t* outlen, static int NextProtoSelectCallback(SSL* ssl, uint8_t** out, uint8_t* outlen,
const uint8_t* in, unsigned inlen, void* arg) { const uint8_t* in, unsigned inlen, void* arg) {
const TestConfig *config = GetConfigPtr(ssl); const TestConfig *config = GetConfigPtr(ssl);
if (config->select_next_proto.empty()) { if (config->select_next_proto.empty()) {
return SSL_TLSEXT_ERR_NOACK; return SSL_TLSEXT_ERR_NOACK;