diff options
| author | Piotr Sikora <piotr@cloudflare.com> | 2013-11-13 15:40:01 -0800 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2013-11-14 01:20:58 +0000 |
| commit | edc687ba0fa14004a32eafea8856f898113847b5 (patch) | |
| tree | 71719ff291577d5c27e3729a13f7b6df787fcf83 /ssl/t1_lib.c | |
| parent | ff0bdbed85bc8df4a05c34298a03444e215fd05c (diff) | |
Fix compilation with no-nextprotoneg.
PR#3106
Diffstat (limited to 'ssl/t1_lib.c')
| -rw-r--r-- | ssl/t1_lib.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/ssl/t1_lib.c b/ssl/t1_lib.c index 65e997f716..274f84631e 100644 --- a/ssl/t1_lib.c +++ b/ssl/t1_lib.c @@ -2503,8 +2503,10 @@ static int ssl_scan_clienthello_tlsext(SSL *s, unsigned char **p, unsigned char { if (tls1_alpn_handle_client_hello(s, data, size, al) != 0) return 0; +#ifndef OPENSSL_NO_NEXTPROTONEG /* ALPN takes precedence over NPN. */ s->s3->next_proto_neg_seen = 0; +#endif } /* session ticket processed earlier */ |