diff options
| author | Ben Laurie <ben@openssl.org> | 2010-09-05 17:14:01 +0000 |
|---|---|---|
| committer | Ben Laurie <ben@openssl.org> | 2010-09-05 17:14:01 +0000 |
| commit | bf48836c7c0f43fd4cabde2721537f0914cfb0f4 (patch) | |
| tree | 9d873391a1525a1695c0798dcccb0ec728e1822d /ssl/s3_clnt.c | |
| parent | d9a268b9f903588e4d89e18bea76107ce78109c0 (diff) | |
| download | openssl-bf48836c7c0f43fd4cabde2721537f0914cfb0f4.tar.gz | |
Fixes to NPN from Adam Langley.
Diffstat (limited to 'ssl/s3_clnt.c')
| -rw-r--r-- | ssl/s3_clnt.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ssl/s3_clnt.c b/ssl/s3_clnt.c index 601c2b121f..ac21f19254 100644 --- a/ssl/s3_clnt.c +++ b/ssl/s3_clnt.c @@ -424,7 +424,7 @@ int ssl3_connect(SSL *s) SSL3_ST_CW_CHANGE_A,SSL3_ST_CW_CHANGE_B); if (ret <= 0) goto end; -#if defined(OPENSSL_NO_TLSEXT) || defined(OPENSSL_NO_NPN) +#if defined(OPENSSL_NO_TLSEXT) || defined(OPENSSL_NO_NEXTPROTONEG) s->state=SSL3_ST_CW_FINISHED_A; #else if (s->next_proto_negotiated) @@ -459,7 +459,7 @@ int ssl3_connect(SSL *s) break; -#if !defined(OPENSSL_NO_TLSEXT) && !defined(OPENSSL_NO_NPN) +#if !defined(OPENSSL_NO_TLSEXT) && !defined(OPENSSL_NO_NEXTPROTONEG) case SSL3_ST_CW_NEXT_PROTO_A: case SSL3_ST_CW_NEXT_PROTO_B: ret=ssl3_send_next_proto(s); @@ -3018,7 +3018,7 @@ err: */ #ifndef OPENSSL_NO_TLSEXT -# ifndef OPENSSL_NO_NPN +# ifndef OPENSSL_NO_NEXTPROTONEG int ssl3_send_next_proto(SSL *s) { unsigned int len, padding_len; |