diff options
author | djm <> | 2012-01-05 22:59:13 +0000 |
---|---|---|
committer | djm <> | 2012-01-05 22:59:13 +0000 |
commit | 731838c66b52c0ae5888333005b74115a620aa96 (patch) | |
tree | 112a26c17bdf32e5d76181791e536ba74549e6dc /src/lib/libssl/s3_clnt.c | |
parent | 113f799ec7d1728f0a5d7ab5b0e3b42e3de56407 (diff) | |
download | openbsd-731838c66b52c0ae5888333005b74115a620aa96.tar.gz openbsd-731838c66b52c0ae5888333005b74115a620aa96.tar.bz2 openbsd-731838c66b52c0ae5888333005b74115a620aa96.zip |
OpenSSL 1.0.0f: import upstream source
Diffstat (limited to 'src/lib/libssl/s3_clnt.c')
-rw-r--r-- | src/lib/libssl/s3_clnt.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/libssl/s3_clnt.c b/src/lib/libssl/s3_clnt.c index 50bd415b56..53223bd38d 100644 --- a/src/lib/libssl/s3_clnt.c +++ b/src/lib/libssl/s3_clnt.c | |||
@@ -953,7 +953,7 @@ int ssl3_get_server_hello(SSL *s) | |||
953 | /* wrong packet length */ | 953 | /* wrong packet length */ |
954 | al=SSL_AD_DECODE_ERROR; | 954 | al=SSL_AD_DECODE_ERROR; |
955 | SSLerr(SSL_F_SSL3_GET_SERVER_HELLO,SSL_R_BAD_PACKET_LENGTH); | 955 | SSLerr(SSL_F_SSL3_GET_SERVER_HELLO,SSL_R_BAD_PACKET_LENGTH); |
956 | goto err; | 956 | goto f_err; |
957 | } | 957 | } |
958 | 958 | ||
959 | return(1); | 959 | return(1); |
@@ -1837,7 +1837,7 @@ int ssl3_get_new_session_ticket(SSL *s) | |||
1837 | if (n < 6) | 1837 | if (n < 6) |
1838 | { | 1838 | { |
1839 | /* need at least ticket_lifetime_hint + ticket length */ | 1839 | /* need at least ticket_lifetime_hint + ticket length */ |
1840 | al = SSL3_AL_FATAL,SSL_AD_DECODE_ERROR; | 1840 | al = SSL_AD_DECODE_ERROR; |
1841 | SSLerr(SSL_F_SSL3_GET_NEW_SESSION_TICKET,SSL_R_LENGTH_MISMATCH); | 1841 | SSLerr(SSL_F_SSL3_GET_NEW_SESSION_TICKET,SSL_R_LENGTH_MISMATCH); |
1842 | goto f_err; | 1842 | goto f_err; |
1843 | } | 1843 | } |
@@ -1848,7 +1848,7 @@ int ssl3_get_new_session_ticket(SSL *s) | |||
1848 | /* ticket_lifetime_hint + ticket_length + ticket */ | 1848 | /* ticket_lifetime_hint + ticket_length + ticket */ |
1849 | if (ticklen + 6 != n) | 1849 | if (ticklen + 6 != n) |
1850 | { | 1850 | { |
1851 | al = SSL3_AL_FATAL,SSL_AD_DECODE_ERROR; | 1851 | al = SSL_AD_DECODE_ERROR; |
1852 | SSLerr(SSL_F_SSL3_GET_NEW_SESSION_TICKET,SSL_R_LENGTH_MISMATCH); | 1852 | SSLerr(SSL_F_SSL3_GET_NEW_SESSION_TICKET,SSL_R_LENGTH_MISMATCH); |
1853 | goto f_err; | 1853 | goto f_err; |
1854 | } | 1854 | } |