diff options
| author |   jsing <jsing@openbsd.org> | 2014-12-14 14:34:43 +0000 |
|---|---|---|
| committer | jsing <jsing@openbsd.org> | 2014-12-14 14:34:43 +0000 |
| commit | 40eee476bc542a54d0b4254d1b38f5f6d772008a (patch) | |
| tree | f02df65af446d9e21886555ef5b97d2e4db7f5e6 /lib/libssl/src/ssl/s3_srvr.c | |
| parent | unifdef NETSCAPE_HANG_BUG from the DTLS code. The code is not currently (diff) | |
| download | wireguard-openbsd-40eee476bc542a54d0b4254d1b38f5f6d772008a.tar.xz wireguard-openbsd-40eee476bc542a54d0b4254d1b38f5f6d772008a.zip | |
unifdef OPENSSL_NO_NEXTPROTONEG, which is one of the last standing #ifndef
mazes in libssl. NPN is being replaced by ALPN, however it is still going
to be around for a while yet.
ok miod@
Diffstat (limited to 'lib/libssl/src/ssl/s3_srvr.c')
| -rw-r--r-- | lib/libssl/src/ssl/s3_srvr.c | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/lib/libssl/src/ssl/s3_srvr.c b/lib/libssl/src/ssl/s3_srvr.c index 645caf4bc95..783b1df782b 100644 --- a/lib/libssl/src/ssl/s3_srvr.c +++ b/lib/libssl/src/ssl/s3_srvr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: s3_srvr.c,v 1.93 2014/12/10 15:43:31 jsing Exp $ */ +/* $OpenBSD: s3_srvr.c,v 1.94 2014/12/14 14:34:43 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -537,14 +537,10 @@ ssl3_accept(SSL *s) * the client uses its key from the certificate * for key exchange. */ -#ifdef OPENSSL_NO_NEXTPROTONEG - s->state = SSL3_ST_SR_FINISHED_A; -#else if (s->s3->next_proto_neg_seen) s->state = SSL3_ST_SR_NEXT_PROTO_A; else s->state = SSL3_ST_SR_FINISHED_A; -#endif s->init_num = 0; } else if (SSL_USE_SIGALGS(s) || (alg_k & SSL_kGOST)) { s->state = SSL3_ST_SR_CERT_VRFY_A; @@ -609,18 +605,13 @@ ssl3_accept(SSL *s) if (ret <= 0) goto end; -#ifdef OPENSSL_NO_NEXTPROTONEG - s->state = SSL3_ST_SR_FINISHED_A; -#else if (s->s3->next_proto_neg_seen) s->state = SSL3_ST_SR_NEXT_PROTO_A; else s->state = SSL3_ST_SR_FINISHED_A; -#endif s->init_num = 0; break; -#ifndef OPENSSL_NO_NEXTPROTONEG case SSL3_ST_SR_NEXT_PROTO_A: case SSL3_ST_SR_NEXT_PROTO_B: ret = ssl3_get_next_proto(s); @@ -629,7 +620,6 @@ ssl3_accept(SSL *s) s->init_num = 0; s->state = SSL3_ST_SR_FINISHED_A; break; -#endif case SSL3_ST_SR_FINISHED_A: case SSL3_ST_SR_FINISHED_B: @@ -701,9 +691,6 @@ ssl3_accept(SSL *s) goto end; s->state = SSL3_ST_SW_FLUSH; if (s->hit) { -#ifdef OPENSSL_NO_NEXTPROTONEG - s->s3->tmp.next_state = SSL3_ST_SR_FINISHED_A; -#else if (s->s3->next_proto_neg_seen) { s->s3->flags |= SSL3_FLAGS_CCS_OK; s->s3->tmp.next_state = @@ -711,7 +698,6 @@ ssl3_accept(SSL *s) } else s->s3->tmp.next_state = SSL3_ST_SR_FINISHED_A; -#endif } else s->s3->tmp.next_state = SSL_ST_OK; s->init_num = 0; @@ -2850,7 +2836,6 @@ ssl3_send_cert_status(SSL *s) return (ssl3_do_write(s, SSL3_RT_HANDSHAKE)); } -# ifndef OPENSSL_NO_NEXTPROTONEG /* * ssl3_get_next_proto reads a Next Protocol Negotiation handshake message. * It sets the next_proto member in s if found @@ -2921,4 +2906,3 @@ ssl3_get_next_proto(SSL *s) return (1); } -# endif |