diff options
author | jsing <> | 2017-10-08 16:42:21 +0000 |
---|---|---|
committer | jsing <> | 2017-10-08 16:42:21 +0000 |
commit | d2e8ad1f2205caba4255fe49dcc60abcddfa2ae8 (patch) | |
tree | 481d5d4431b9ea72ba3bc7bba12fc22b9a7e254f /src/lib | |
parent | 759dd02e3ff981ea9d2869cfe079c8f201eba19d (diff) | |
download | openbsd-d2e8ad1f2205caba4255fe49dcc60abcddfa2ae8.tar.gz openbsd-d2e8ad1f2205caba4255fe49dcc60abcddfa2ae8.tar.bz2 openbsd-d2e8ad1f2205caba4255fe49dcc60abcddfa2ae8.zip |
Fix some style/whitespace/indentation issues in ssl3_connect().
Diffstat (limited to 'src/lib')
-rw-r--r-- | src/lib/libssl/ssl_clnt.c | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/src/lib/libssl/ssl_clnt.c b/src/lib/libssl/ssl_clnt.c index 2370ce06f7..fb4d9da174 100644 --- a/src/lib/libssl/ssl_clnt.c +++ b/src/lib/libssl/ssl_clnt.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssl_clnt.c,v 1.17 2017/08/12 21:47:59 jsing Exp $ */ | 1 | /* $OpenBSD: ssl_clnt.c,v 1.18 2017/10/08 16:42:21 jsing 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 | * |
@@ -176,9 +176,9 @@ static int ca_dn_cmp(const X509_NAME * const *a, const X509_NAME * const *b); | |||
176 | int | 176 | int |
177 | ssl3_connect(SSL *s) | 177 | ssl3_connect(SSL *s) |
178 | { | 178 | { |
179 | void (*cb)(const SSL *ssl, int type, int val) = NULL; | 179 | void (*cb)(const SSL *ssl, int type, int val) = NULL; |
180 | int ret = -1; | 180 | int ret = -1; |
181 | int new_state, state, skip = 0; | 181 | int new_state, state, skip = 0; |
182 | 182 | ||
183 | ERR_clear_error(); | 183 | ERR_clear_error(); |
184 | errno = 0; | 184 | errno = 0; |
@@ -210,7 +210,7 @@ ssl3_connect(SSL *s) | |||
210 | if (cb != NULL) | 210 | if (cb != NULL) |
211 | cb(s, SSL_CB_HANDSHAKE_START, 1); | 211 | cb(s, SSL_CB_HANDSHAKE_START, 1); |
212 | 212 | ||
213 | if ((s->version & 0xff00 ) != 0x0300) { | 213 | if ((s->version & 0xff00) != 0x0300) { |
214 | SSLerror(s, ERR_R_INTERNAL_ERROR); | 214 | SSLerror(s, ERR_R_INTERNAL_ERROR); |
215 | ret = -1; | 215 | ret = -1; |
216 | goto end; | 216 | goto end; |
@@ -431,8 +431,7 @@ ssl3_connect(SSL *s) | |||
431 | case SSL3_ST_CW_FINISHED_A: | 431 | case SSL3_ST_CW_FINISHED_A: |
432 | case SSL3_ST_CW_FINISHED_B: | 432 | case SSL3_ST_CW_FINISHED_B: |
433 | ret = ssl3_send_finished(s, SSL3_ST_CW_FINISHED_A, | 433 | ret = ssl3_send_finished(s, SSL3_ST_CW_FINISHED_A, |
434 | SSL3_ST_CW_FINISHED_B, | 434 | SSL3_ST_CW_FINISHED_B, TLS_MD_CLIENT_FINISH_CONST, |
435 | TLS_MD_CLIENT_FINISH_CONST, | ||
436 | TLS_MD_CLIENT_FINISH_CONST_SIZE); | 435 | TLS_MD_CLIENT_FINISH_CONST_SIZE); |
437 | if (ret <= 0) | 436 | if (ret <= 0) |
438 | goto end; | 437 | goto end; |
@@ -446,7 +445,7 @@ ssl3_connect(SSL *s) | |||
446 | if (s->s3->flags & | 445 | if (s->s3->flags & |
447 | SSL3_FLAGS_DELAY_CLIENT_FINISHED) { | 446 | SSL3_FLAGS_DELAY_CLIENT_FINISHED) { |
448 | S3I(s)->hs.state = SSL_ST_OK; | 447 | S3I(s)->hs.state = SSL_ST_OK; |
449 | s->s3->flags|=SSL3_FLAGS_POP_BUFFER; | 448 | s->s3->flags |= SSL3_FLAGS_POP_BUFFER; |
450 | S3I(s)->delay_buf_pop_ret = 0; | 449 | S3I(s)->delay_buf_pop_ret = 0; |
451 | } | 450 | } |
452 | } else { | 451 | } else { |
@@ -455,8 +454,8 @@ ssl3_connect(SSL *s) | |||
455 | S3I(s)->hs.next_state = | 454 | S3I(s)->hs.next_state = |
456 | SSL3_ST_CR_SESSION_TICKET_A; | 455 | SSL3_ST_CR_SESSION_TICKET_A; |
457 | else | 456 | else |
458 | 457 | S3I(s)->hs.next_state = | |
459 | S3I(s)->hs.next_state = SSL3_ST_CR_FINISHED_A; | 458 | SSL3_ST_CR_FINISHED_A; |
460 | } | 459 | } |
461 | s->internal->init_num = 0; | 460 | s->internal->init_num = 0; |
462 | break; | 461 | break; |