diff options
Diffstat (limited to 'src/lib/libssl/ssl_rsa.c')
| -rw-r--r-- | src/lib/libssl/ssl_rsa.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/lib/libssl/ssl_rsa.c b/src/lib/libssl/ssl_rsa.c index 3efed227f0..facb8ac274 100644 --- a/src/lib/libssl/ssl_rsa.c +++ b/src/lib/libssl/ssl_rsa.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: ssl_rsa.c,v 1.26 2017/01/26 10:40:21 beck Exp $ */ | 1 | /* $OpenBSD: ssl_rsa.c,v 1.27 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 | * |
| @@ -565,8 +565,7 @@ int | |||
| 565 | SSL_CTX_use_PrivateKey(SSL_CTX *ctx, EVP_PKEY *pkey) | 565 | SSL_CTX_use_PrivateKey(SSL_CTX *ctx, EVP_PKEY *pkey) |
| 566 | { | 566 | { |
| 567 | if (pkey == NULL) { | 567 | if (pkey == NULL) { |
| 568 | SSLerror( | 568 | SSLerror(ERR_R_PASSED_NULL_PARAMETER); |
| 569 | ERR_R_PASSED_NULL_PARAMETER); | ||
| 570 | return (0); | 569 | return (0); |
| 571 | } | 570 | } |
| 572 | if (!ssl_cert_inst(&ctx->internal->cert)) { | 571 | if (!ssl_cert_inst(&ctx->internal->cert)) { |
| @@ -602,8 +601,7 @@ SSL_CTX_use_PrivateKey_file(SSL_CTX *ctx, const char *file, int type) | |||
| 602 | j = ERR_R_ASN1_LIB; | 601 | j = ERR_R_ASN1_LIB; |
| 603 | pkey = d2i_PrivateKey_bio(in, NULL); | 602 | pkey = d2i_PrivateKey_bio(in, NULL); |
| 604 | } else { | 603 | } else { |
| 605 | SSLerror( | 604 | SSLerror(SSL_R_BAD_SSL_FILETYPE); |
| 606 | SSL_R_BAD_SSL_FILETYPE); | ||
| 607 | goto end; | 605 | goto end; |
| 608 | } | 606 | } |
| 609 | if (pkey == NULL) { | 607 | if (pkey == NULL) { |
