diff options
Diffstat (limited to '')
| -rw-r--r-- | src/lib/libssl/ssl_both.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/src/lib/libssl/ssl_both.c b/src/lib/libssl/ssl_both.c index 707feb6d09..0a33002809 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.3 2017/01/26 10:40:21 beck Exp $ */ | 1 | /* $OpenBSD: ssl_both.c,v 1.4 2017/01/26 12:16:13 beck 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 | * |
| @@ -365,8 +365,7 @@ ssl3_output_cert_chain(SSL *s, CBB *cbb, X509 *x) | |||
| 365 | 365 | ||
| 366 | if (!X509_STORE_CTX_init(&xs_ctx, s->ctx->cert_store, | 366 | if (!X509_STORE_CTX_init(&xs_ctx, s->ctx->cert_store, |
| 367 | x, NULL)) { | 367 | x, NULL)) { |
| 368 | SSLerror( | 368 | SSLerror(ERR_R_X509_LIB); |
| 369 | ERR_R_X509_LIB); | ||
| 370 | goto err; | 369 | goto err; |
| 371 | } | 370 | } |
| 372 | X509_verify_cert(&xs_ctx); | 371 | X509_verify_cert(&xs_ctx); |
| @@ -420,8 +419,7 @@ ssl3_get_message(SSL *s, int st1, int stn, int mt, long max, int *ok) | |||
| 420 | S3I(s)->tmp.reuse_message = 0; | 419 | S3I(s)->tmp.reuse_message = 0; |
| 421 | if ((mt >= 0) && (S3I(s)->tmp.message_type != mt)) { | 420 | if ((mt >= 0) && (S3I(s)->tmp.message_type != mt)) { |
| 422 | al = SSL_AD_UNEXPECTED_MESSAGE; | 421 | al = SSL_AD_UNEXPECTED_MESSAGE; |
| 423 | SSLerror( | 422 | SSLerror(SSL_R_UNEXPECTED_MESSAGE); |
| 424 | SSL_R_UNEXPECTED_MESSAGE); | ||
| 425 | goto f_err; | 423 | goto f_err; |
| 426 | } | 424 | } |
| 427 | *ok = 1; | 425 | *ok = 1; |
| @@ -473,8 +471,7 @@ ssl3_get_message(SSL *s, int st1, int stn, int mt, long max, int *ok) | |||
| 473 | 471 | ||
| 474 | if ((mt >= 0) && (*p != mt)) { | 472 | if ((mt >= 0) && (*p != mt)) { |
| 475 | al = SSL_AD_UNEXPECTED_MESSAGE; | 473 | al = SSL_AD_UNEXPECTED_MESSAGE; |
| 476 | SSLerror( | 474 | SSLerror(SSL_R_UNEXPECTED_MESSAGE); |
| 477 | SSL_R_UNEXPECTED_MESSAGE); | ||
| 478 | goto f_err; | 475 | goto f_err; |
| 479 | } | 476 | } |
| 480 | 477 | ||
| @@ -488,8 +485,7 @@ ssl3_get_message(SSL *s, int st1, int stn, int mt, long max, int *ok) | |||
| 488 | 485 | ||
| 489 | if (l > (unsigned long)max) { | 486 | if (l > (unsigned long)max) { |
| 490 | al = SSL_AD_ILLEGAL_PARAMETER; | 487 | al = SSL_AD_ILLEGAL_PARAMETER; |
| 491 | SSLerror( | 488 | SSLerror(SSL_R_EXCESSIVE_MESSAGE_SIZE); |
| 492 | SSL_R_EXCESSIVE_MESSAGE_SIZE); | ||
| 493 | goto f_err; | 489 | goto f_err; |
| 494 | } | 490 | } |
| 495 | if (l && !BUF_MEM_grow_clean(s->internal->init_buf, l + 4)) { | 491 | if (l && !BUF_MEM_grow_clean(s->internal->init_buf, l + 4)) { |
