Minor formatting tweaks.
Some things were misindented in the reformatting. Change-Id: I97642000452ce4d5b4c8a39b794cec13097d8760 Reviewed-on: https://boringssl-review.googlesource.com/3870 Reviewed-by: Adam Langley <agl@google.com>
This commit is contained in:
parent
bcd374570c
commit
b18f024816
@ -2975,7 +2975,7 @@ uint16_t ssl3_get_mutual_version(SSL *s, uint16_t client_version) {
|
||||
if (client_version <= DTLS1_2_VERSION && !(s->options & SSL_OP_NO_DTLSv1_2)) {
|
||||
version = DTLS1_2_VERSION;
|
||||
} else if (client_version <= DTLS1_VERSION &&
|
||||
!(s->options & SSL_OP_NO_DTLSv1)) {
|
||||
!(s->options & SSL_OP_NO_DTLSv1)) {
|
||||
version = DTLS1_VERSION;
|
||||
}
|
||||
|
||||
|
@ -149,7 +149,7 @@
|
||||
static const char g_pending_session_magic = 0;
|
||||
|
||||
static void SSL_SESSION_list_remove(SSL_CTX *ctx, SSL_SESSION *s);
|
||||
static void SSL_SESSION_list_add(SSL_CTX *ctx,SSL_SESSION *s);
|
||||
static void SSL_SESSION_list_add(SSL_CTX *ctx, SSL_SESSION *s);
|
||||
static int remove_session_lock(SSL_CTX *ctx, SSL_SESSION *c, int lck);
|
||||
|
||||
SSL_SESSION *SSL_magic_pending_session_ptr(void) {
|
||||
|
@ -1990,7 +1990,7 @@ static int ssl_check_serverhello_tlsext(SSL *s) {
|
||||
ret = s->ctx->tlsext_servername_callback(s, &al,
|
||||
s->ctx->tlsext_servername_arg);
|
||||
} else if (s->initial_ctx != NULL &&
|
||||
s->initial_ctx->tlsext_servername_callback != 0) {
|
||||
s->initial_ctx->tlsext_servername_callback != 0) {
|
||||
ret = s->initial_ctx->tlsext_servername_callback(
|
||||
s, &al, s->initial_ctx->tlsext_servername_arg);
|
||||
}
|
||||
|
@ -170,8 +170,7 @@ int ssl_add_serverhello_renegotiate_ext(SSL *s, unsigned char *p, int *len,
|
||||
int maxlen) {
|
||||
if (p) {
|
||||
if (s->s3->previous_client_finished_len +
|
||||
s->s3->previous_server_finished_len + 1 >
|
||||
maxlen) {
|
||||
s->s3->previous_server_finished_len + 1 > maxlen) {
|
||||
OPENSSL_PUT_ERROR(SSL, ssl_add_serverhello_renegotiate_ext,
|
||||
SSL_R_RENEGOTIATE_EXT_TOO_LONG);
|
||||
return 0;
|
||||
|
Loading…
Reference in New Issue
Block a user