diff options
Diffstat (limited to 'src/lib/libssl/ssl_rsa.c')
| -rw-r--r-- | src/lib/libssl/ssl_rsa.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/lib/libssl/ssl_rsa.c b/src/lib/libssl/ssl_rsa.c index 647cc4bfd8..cbb1c0b562 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.22 2017/01/23 04:15:28 jsing Exp $ */ | 1 | /* $OpenBSD: ssl_rsa.c,v 1.23 2017/01/23 05:13:02 jsing 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 | * |
| @@ -353,11 +353,11 @@ SSL_CTX_use_certificate(SSL_CTX *ctx, X509 *x) | |||
| 353 | SSLerr(SSL_F_SSL_CTX_USE_CERTIFICATE, ERR_R_PASSED_NULL_PARAMETER); | 353 | SSLerr(SSL_F_SSL_CTX_USE_CERTIFICATE, ERR_R_PASSED_NULL_PARAMETER); |
| 354 | return (0); | 354 | return (0); |
| 355 | } | 355 | } |
| 356 | if (!ssl_cert_inst(&ctx->cert)) { | 356 | if (!ssl_cert_inst(&ctx->internal->cert)) { |
| 357 | SSLerr(SSL_F_SSL_CTX_USE_CERTIFICATE, ERR_R_MALLOC_FAILURE); | 357 | SSLerr(SSL_F_SSL_CTX_USE_CERTIFICATE, ERR_R_MALLOC_FAILURE); |
| 358 | return (0); | 358 | return (0); |
| 359 | } | 359 | } |
| 360 | return (ssl_set_cert(ctx->cert, x)); | 360 | return (ssl_set_cert(ctx->internal->cert, x)); |
| 361 | } | 361 | } |
| 362 | 362 | ||
| 363 | static int | 363 | static int |
| @@ -486,7 +486,7 @@ SSL_CTX_use_RSAPrivateKey(SSL_CTX *ctx, RSA *rsa) | |||
| 486 | SSLerr(SSL_F_SSL_CTX_USE_RSAPRIVATEKEY, ERR_R_PASSED_NULL_PARAMETER); | 486 | SSLerr(SSL_F_SSL_CTX_USE_RSAPRIVATEKEY, ERR_R_PASSED_NULL_PARAMETER); |
| 487 | return (0); | 487 | return (0); |
| 488 | } | 488 | } |
| 489 | if (!ssl_cert_inst(&ctx->cert)) { | 489 | if (!ssl_cert_inst(&ctx->internal->cert)) { |
| 490 | SSLerr(SSL_F_SSL_CTX_USE_RSAPRIVATEKEY, ERR_R_MALLOC_FAILURE); | 490 | SSLerr(SSL_F_SSL_CTX_USE_RSAPRIVATEKEY, ERR_R_MALLOC_FAILURE); |
| 491 | return (0); | 491 | return (0); |
| 492 | } | 492 | } |
| @@ -498,7 +498,7 @@ SSL_CTX_use_RSAPrivateKey(SSL_CTX *ctx, RSA *rsa) | |||
| 498 | RSA_up_ref(rsa); | 498 | RSA_up_ref(rsa); |
| 499 | EVP_PKEY_assign_RSA(pkey, rsa); | 499 | EVP_PKEY_assign_RSA(pkey, rsa); |
| 500 | 500 | ||
| 501 | ret = ssl_set_pkey(ctx->cert, pkey); | 501 | ret = ssl_set_pkey(ctx->internal->cert, pkey); |
| 502 | EVP_PKEY_free(pkey); | 502 | EVP_PKEY_free(pkey); |
| 503 | return (ret); | 503 | return (ret); |
| 504 | } | 504 | } |
| @@ -569,11 +569,11 @@ SSL_CTX_use_PrivateKey(SSL_CTX *ctx, EVP_PKEY *pkey) | |||
| 569 | ERR_R_PASSED_NULL_PARAMETER); | 569 | ERR_R_PASSED_NULL_PARAMETER); |
| 570 | return (0); | 570 | return (0); |
| 571 | } | 571 | } |
| 572 | if (!ssl_cert_inst(&ctx->cert)) { | 572 | if (!ssl_cert_inst(&ctx->internal->cert)) { |
| 573 | SSLerr(SSL_F_SSL_CTX_USE_PRIVATEKEY, ERR_R_MALLOC_FAILURE); | 573 | SSLerr(SSL_F_SSL_CTX_USE_PRIVATEKEY, ERR_R_MALLOC_FAILURE); |
| 574 | return (0); | 574 | return (0); |
| 575 | } | 575 | } |
| 576 | return (ssl_set_pkey(ctx->cert, pkey)); | 576 | return (ssl_set_pkey(ctx->internal->cert, pkey)); |
| 577 | } | 577 | } |
| 578 | 578 | ||
| 579 | int | 579 | int |
