diff options
| author | Joel Sing <jsing@cvs.openbsd.org> | 2014-05-31 13:55:46 +0000 |
|---|---|---|
| committer | Joel Sing <jsing@cvs.openbsd.org> | 2014-05-31 13:55:46 +0000 |
| commit | 691c24442e5d1b5ac7d05e75fbd19839cf2d0513 (patch) | |
| tree | 708b6c0014f8a013088873d8535a9c0807f3d14f /lib/libssl/s3_srvr.c | |
| parent | df4cd21dfeed39ef6ae39bf052bd57c4b196149b (diff) | |
More manual OPENSSL_NO_EC and OPENSSL_NO_TLSEXT cleanup.
Diffstat (limited to 'lib/libssl/s3_srvr.c')
| -rw-r--r-- | lib/libssl/s3_srvr.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/libssl/s3_srvr.c b/lib/libssl/s3_srvr.c index 4a6c3cb1e8b..f12b680e996 100644 --- a/lib/libssl/s3_srvr.c +++ b/lib/libssl/s3_srvr.c @@ -570,7 +570,7 @@ ssl3_accept(SSL *s) * the client uses its key from the certificate * for key exchange. */ -#if defined(OPENSSL_NO_TLSEXT) || defined(OPENSSL_NO_NEXTPROTONEG) +#ifdef OPENSSL_NO_NEXTPROTONEG s->state = SSL3_ST_SR_FINISHED_A; #else if (s->s3->next_proto_neg_seen) @@ -641,7 +641,7 @@ ssl3_accept(SSL *s) if (ret <= 0) goto end; -#if defined(OPENSSL_NO_TLSEXT) || defined(OPENSSL_NO_NEXTPROTONEG) +#ifdef OPENSSL_NO_NEXTPROTONEG s->state = SSL3_ST_SR_FINISHED_A; #else if (s->s3->next_proto_neg_seen) @@ -652,7 +652,7 @@ ssl3_accept(SSL *s) s->init_num = 0; break; -#if !defined(OPENSSL_NO_TLSEXT) && !defined(OPENSSL_NO_NEXTPROTONEG) +#ifndef OPENSSL_NO_NEXTPROTONEG case SSL3_ST_SR_NEXT_PROTO_A: case SSL3_ST_SR_NEXT_PROTO_B: ret = ssl3_get_next_proto(s); @@ -732,7 +732,7 @@ ssl3_accept(SSL *s) goto end; s->state = SSL3_ST_SW_FLUSH; if (s->hit) { -#if defined(OPENSSL_NO_TLSEXT) || defined(OPENSSL_NO_NEXTPROTONEG) +#ifdef OPENSSL_NO_NEXTPROTONEG s->s3->tmp.next_state = SSL3_ST_SR_FINISHED_A; #else if (s->s3->next_proto_neg_seen) |