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_both.c | |
| parent | d9a268b9f903588e4d89e18bea76107ce78109c0 (diff) | |
Fixes to NPN from Adam Langley.
Diffstat (limited to 'ssl/s3_both.c')
| -rw-r--r-- | ssl/s3_both.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ssl/s3_both.c b/ssl/s3_both.c index 89f7c42f03..be766aac6a 100644 --- a/ssl/s3_both.c +++ b/ssl/s3_both.c @@ -202,7 +202,7 @@ int ssl3_send_finished(SSL *s, int a, int b, const char *sender, int slen) return(ssl3_do_write(s,SSL3_RT_HANDSHAKE)); } -#ifndef OPENSSL_NO_NPN +#ifndef OPENSSL_NO_NEXTPROTONEG /* ssl3_take_mac calculates the Finished MAC for the handshakes messages seen to far. */ static void ssl3_take_mac(SSL *s) { @@ -231,7 +231,7 @@ int ssl3_get_finished(SSL *s, int a, int b) long n; unsigned char *p; -#ifdef OPENSSL_NO_NPN +#ifdef OPENSSL_NO_NEXTPROTONEG /* the mac has already been generated when we received the * change cipher spec message and is in s->s3->tmp.peer_finish_md */ @@ -540,7 +540,7 @@ long ssl3_get_message(SSL *s, int st1, int stn, int mt, long max, int *ok) n -= i; } -#ifndef OPENSSL_NO_NPN +#ifndef OPENSSL_NO_NEXTPROTONEG /* If receiving Finished, record MAC of prior handshake messages for * Finished verification. */ if (*s->init_buf->data == SSL3_MT_FINISHED) |