diff options
| author | Bodo Möller <bodo@openssl.org> | 2005-05-03 23:03:26 +0000 |
|---|---|---|
| committer | Bodo Möller <bodo@openssl.org> | 2005-05-03 23:03:26 +0000 |
| commit | 645a865ddeae5f9661b70956d0bcf3a1f3a7652e (patch) | |
| tree | 55f554dc4118c4fe21226b4d3a688f2eb1669cc0 | |
| parent | 682e1f6469d9fa482a49aceec50a4b2aff79e82d (diff) | |
| download | openssl-OpenSSL_0_9_6-stable.tar.gz | |
Fixes so alerts are sent properly in s3_pkt.cOpenSSL_0_9_6-stable
PR: 851
[backport from OpenSSL_0_9_7-stable branch / head]
| -rw-r--r-- | ssl/s3_pkt.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/ssl/s3_pkt.c b/ssl/s3_pkt.c index 75b49f715f..82e7e677e5 100644 --- a/ssl/s3_pkt.c +++ b/ssl/s3_pkt.c @@ -862,7 +862,7 @@ start: { al=SSL_AD_UNEXPECTED_MESSAGE; SSLerr(SSL_F_SSL3_READ_BYTES,SSL_R_DATA_BETWEEN_CCS_AND_FINISHED); - goto err; + goto f_err; } /* If the other end has shut down, throw anything we read away @@ -969,7 +969,7 @@ start: { al=SSL_AD_DECODE_ERROR; SSLerr(SSL_F_SSL3_READ_BYTES,SSL_R_BAD_HELLO_REQUEST); - goto err; + goto f_err; } if (SSL_is_init_finished(s) && @@ -1074,17 +1074,17 @@ start: if ( (rr->length != 1) || (rr->off != 0) || (rr->data[0] != SSL3_MT_CCS)) { - i=SSL_AD_ILLEGAL_PARAMETER; + al=SSL_AD_ILLEGAL_PARAMETER; SSLerr(SSL_F_SSL3_READ_BYTES,SSL_R_BAD_CHANGE_CIPHER_SPEC); - goto err; + goto f_err; } /* Check we have a cipher to change to */ if (s->s3->tmp.new_cipher == NULL) { - i=SSL_AD_UNEXPECTED_MESSAGE; + al=SSL_AD_UNEXPECTED_MESSAGE; SSLerr(SSL_F_SSL3_GET_CERT_VERIFY,SSL_R_CCS_RECEIVED_EARLY); - goto err; + goto f_err; } rr->length=0; |