diff options
Diffstat (limited to 'src/lib/libssl/ssl_both.c')
-rw-r--r-- | src/lib/libssl/ssl_both.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/lib/libssl/ssl_both.c b/src/lib/libssl/ssl_both.c index ee69f9a121..6ce127fb0b 100644 --- a/src/lib/libssl/ssl_both.c +++ b/src/lib/libssl/ssl_both.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssl_both.c,v 1.23 2021/01/07 15:32:59 jsing Exp $ */ | 1 | /* $OpenBSD: ssl_both.c,v 1.24 2021/02/20 14:14:16 tb Exp $ */ |
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
@@ -256,7 +256,7 @@ ssl3_get_finished(SSL *s, int a, int b) | |||
256 | if (!S3I(s)->change_cipher_spec) { | 256 | if (!S3I(s)->change_cipher_spec) { |
257 | al = SSL_AD_UNEXPECTED_MESSAGE; | 257 | al = SSL_AD_UNEXPECTED_MESSAGE; |
258 | SSLerror(s, SSL_R_GOT_A_FIN_BEFORE_A_CCS); | 258 | SSLerror(s, SSL_R_GOT_A_FIN_BEFORE_A_CCS); |
259 | goto f_err; | 259 | goto fatal_err; |
260 | } | 260 | } |
261 | S3I(s)->change_cipher_spec = 0; | 261 | S3I(s)->change_cipher_spec = 0; |
262 | 262 | ||
@@ -265,7 +265,7 @@ ssl3_get_finished(SSL *s, int a, int b) | |||
265 | if (n < 0) { | 265 | if (n < 0) { |
266 | al = SSL_AD_DECODE_ERROR; | 266 | al = SSL_AD_DECODE_ERROR; |
267 | SSLerror(s, SSL_R_BAD_DIGEST_LENGTH); | 267 | SSLerror(s, SSL_R_BAD_DIGEST_LENGTH); |
268 | goto f_err; | 268 | goto fatal_err; |
269 | } | 269 | } |
270 | 270 | ||
271 | CBS_init(&cbs, s->internal->init_msg, n); | 271 | CBS_init(&cbs, s->internal->init_msg, n); |
@@ -274,13 +274,13 @@ ssl3_get_finished(SSL *s, int a, int b) | |||
274 | CBS_len(&cbs) != md_len) { | 274 | CBS_len(&cbs) != md_len) { |
275 | al = SSL_AD_DECODE_ERROR; | 275 | al = SSL_AD_DECODE_ERROR; |
276 | SSLerror(s, SSL_R_BAD_DIGEST_LENGTH); | 276 | SSLerror(s, SSL_R_BAD_DIGEST_LENGTH); |
277 | goto f_err; | 277 | goto fatal_err; |
278 | } | 278 | } |
279 | 279 | ||
280 | if (!CBS_mem_equal(&cbs, S3I(s)->tmp.peer_finish_md, CBS_len(&cbs))) { | 280 | if (!CBS_mem_equal(&cbs, S3I(s)->tmp.peer_finish_md, CBS_len(&cbs))) { |
281 | al = SSL_AD_DECRYPT_ERROR; | 281 | al = SSL_AD_DECRYPT_ERROR; |
282 | SSLerror(s, SSL_R_DIGEST_CHECK_FAILED); | 282 | SSLerror(s, SSL_R_DIGEST_CHECK_FAILED); |
283 | goto f_err; | 283 | goto fatal_err; |
284 | } | 284 | } |
285 | 285 | ||
286 | /* Copy finished so we can use it for renegotiation checks. */ | 286 | /* Copy finished so we can use it for renegotiation checks. */ |
@@ -296,7 +296,7 @@ ssl3_get_finished(SSL *s, int a, int b) | |||
296 | } | 296 | } |
297 | 297 | ||
298 | return (1); | 298 | return (1); |
299 | f_err: | 299 | fatal_err: |
300 | ssl3_send_alert(s, SSL3_AL_FATAL, al); | 300 | ssl3_send_alert(s, SSL3_AL_FATAL, al); |
301 | return (0); | 301 | return (0); |
302 | } | 302 | } |
@@ -450,7 +450,7 @@ ssl3_get_message(SSL *s, int st1, int stn, int mt, long max, int *ok) | |||
450 | if ((mt >= 0) && (S3I(s)->tmp.message_type != mt)) { | 450 | if ((mt >= 0) && (S3I(s)->tmp.message_type != mt)) { |
451 | al = SSL_AD_UNEXPECTED_MESSAGE; | 451 | al = SSL_AD_UNEXPECTED_MESSAGE; |
452 | SSLerror(s, SSL_R_UNEXPECTED_MESSAGE); | 452 | SSLerror(s, SSL_R_UNEXPECTED_MESSAGE); |
453 | goto f_err; | 453 | goto fatal_err; |
454 | } | 454 | } |
455 | *ok = 1; | 455 | *ok = 1; |
456 | s->internal->init_msg = s->internal->init_buf->data + 4; | 456 | s->internal->init_msg = s->internal->init_buf->data + 4; |
@@ -502,7 +502,7 @@ ssl3_get_message(SSL *s, int st1, int stn, int mt, long max, int *ok) | |||
502 | if ((mt >= 0) && (*p != mt)) { | 502 | if ((mt >= 0) && (*p != mt)) { |
503 | al = SSL_AD_UNEXPECTED_MESSAGE; | 503 | al = SSL_AD_UNEXPECTED_MESSAGE; |
504 | SSLerror(s, SSL_R_UNEXPECTED_MESSAGE); | 504 | SSLerror(s, SSL_R_UNEXPECTED_MESSAGE); |
505 | goto f_err; | 505 | goto fatal_err; |
506 | } | 506 | } |
507 | 507 | ||
508 | CBS_init(&cbs, p, 4); | 508 | CBS_init(&cbs, p, 4); |
@@ -516,7 +516,7 @@ ssl3_get_message(SSL *s, int st1, int stn, int mt, long max, int *ok) | |||
516 | if (l > (unsigned long)max) { | 516 | if (l > (unsigned long)max) { |
517 | al = SSL_AD_ILLEGAL_PARAMETER; | 517 | al = SSL_AD_ILLEGAL_PARAMETER; |
518 | SSLerror(s, SSL_R_EXCESSIVE_MESSAGE_SIZE); | 518 | SSLerror(s, SSL_R_EXCESSIVE_MESSAGE_SIZE); |
519 | goto f_err; | 519 | goto fatal_err; |
520 | } | 520 | } |
521 | if (l && !BUF_MEM_grow_clean(s->internal->init_buf, l + 4)) { | 521 | if (l && !BUF_MEM_grow_clean(s->internal->init_buf, l + 4)) { |
522 | SSLerror(s, ERR_R_BUF_LIB); | 522 | SSLerror(s, ERR_R_BUF_LIB); |
@@ -564,7 +564,7 @@ ssl3_get_message(SSL *s, int st1, int stn, int mt, long max, int *ok) | |||
564 | *ok = 1; | 564 | *ok = 1; |
565 | return (s->internal->init_num); | 565 | return (s->internal->init_num); |
566 | 566 | ||
567 | f_err: | 567 | fatal_err: |
568 | ssl3_send_alert(s, SSL3_AL_FATAL, al); | 568 | ssl3_send_alert(s, SSL3_AL_FATAL, al); |
569 | err: | 569 | err: |
570 | *ok = 0; | 570 | *ok = 0; |