diff options
Diffstat (limited to '')
| -rw-r--r-- | src/lib/libssl/s3_srvr.c | 8 | 
1 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/libssl/s3_srvr.c b/src/lib/libssl/s3_srvr.c index 4a6c3cb1e8..f12b680e99 100644 --- a/src/lib/libssl/s3_srvr.c +++ b/src/lib/libssl/s3_srvr.c  | |||
| @@ -570,7 +570,7 @@ ssl3_accept(SSL *s) | |||
| 570 | * the client uses its key from the certificate | 570 | * the client uses its key from the certificate | 
| 571 | * for key exchange. | 571 | * for key exchange. | 
| 572 | */ | 572 | */ | 
| 573 | #if defined(OPENSSL_NO_TLSEXT) || defined(OPENSSL_NO_NEXTPROTONEG) | 573 | #ifdef OPENSSL_NO_NEXTPROTONEG | 
| 574 | s->state = SSL3_ST_SR_FINISHED_A; | 574 | s->state = SSL3_ST_SR_FINISHED_A; | 
| 575 | #else | 575 | #else | 
| 576 | if (s->s3->next_proto_neg_seen) | 576 | if (s->s3->next_proto_neg_seen) | 
| @@ -641,7 +641,7 @@ ssl3_accept(SSL *s) | |||
| 641 | if (ret <= 0) | 641 | if (ret <= 0) | 
| 642 | goto end; | 642 | goto end; | 
| 643 | 643 | ||
| 644 | #if defined(OPENSSL_NO_TLSEXT) || defined(OPENSSL_NO_NEXTPROTONEG) | 644 | #ifdef OPENSSL_NO_NEXTPROTONEG | 
| 645 | s->state = SSL3_ST_SR_FINISHED_A; | 645 | s->state = SSL3_ST_SR_FINISHED_A; | 
| 646 | #else | 646 | #else | 
| 647 | if (s->s3->next_proto_neg_seen) | 647 | if (s->s3->next_proto_neg_seen) | 
| @@ -652,7 +652,7 @@ ssl3_accept(SSL *s) | |||
| 652 | s->init_num = 0; | 652 | s->init_num = 0; | 
| 653 | break; | 653 | break; | 
| 654 | 654 | ||
| 655 | #if !defined(OPENSSL_NO_TLSEXT) && !defined(OPENSSL_NO_NEXTPROTONEG) | 655 | #ifndef OPENSSL_NO_NEXTPROTONEG | 
| 656 | case SSL3_ST_SR_NEXT_PROTO_A: | 656 | case SSL3_ST_SR_NEXT_PROTO_A: | 
| 657 | case SSL3_ST_SR_NEXT_PROTO_B: | 657 | case SSL3_ST_SR_NEXT_PROTO_B: | 
| 658 | ret = ssl3_get_next_proto(s); | 658 | ret = ssl3_get_next_proto(s); | 
| @@ -732,7 +732,7 @@ ssl3_accept(SSL *s) | |||
| 732 | goto end; | 732 | goto end; | 
| 733 | s->state = SSL3_ST_SW_FLUSH; | 733 | s->state = SSL3_ST_SW_FLUSH; | 
| 734 | if (s->hit) { | 734 | if (s->hit) { | 
| 735 | #if defined(OPENSSL_NO_TLSEXT) || defined(OPENSSL_NO_NEXTPROTONEG) | 735 | #ifdef OPENSSL_NO_NEXTPROTONEG | 
| 736 | s->s3->tmp.next_state = SSL3_ST_SR_FINISHED_A; | 736 | s->s3->tmp.next_state = SSL3_ST_SR_FINISHED_A; | 
| 737 | #else | 737 | #else | 
| 738 | if (s->s3->next_proto_neg_seen) | 738 | if (s->s3->next_proto_neg_seen) | 
