diff options
author | beck <> | 2017-01-29 17:49:23 +0000 |
---|---|---|
committer | beck <> | 2017-01-29 17:49:23 +0000 |
commit | 957b11334a7afb14537322f0e4795b2e368b3f59 (patch) | |
tree | 1a54abba678898ee5270ae4f3404a50ee9a92eea /src/lib/libcrypto/evp/p_open.c | |
parent | df96e020e729c6c37a8c7fe311fdd1fe6a8718c5 (diff) | |
download | openbsd-957b11334a7afb14537322f0e4795b2e368b3f59.tar.gz openbsd-957b11334a7afb14537322f0e4795b2e368b3f59.tar.bz2 openbsd-957b11334a7afb14537322f0e4795b2e368b3f59.zip |
Send the function codes from the error functions to the bit bucket,
as was done earlier in libssl. Thanks inoguchi@ for noticing
libssl had more reacharounds into this.
ok jsing@ inoguchi@
Diffstat (limited to 'src/lib/libcrypto/evp/p_open.c')
-rw-r--r-- | src/lib/libcrypto/evp/p_open.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/libcrypto/evp/p_open.c b/src/lib/libcrypto/evp/p_open.c index 002a6dea70..1eb238dfde 100644 --- a/src/lib/libcrypto/evp/p_open.c +++ b/src/lib/libcrypto/evp/p_open.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: p_open.c,v 1.17 2015/09/10 15:56:25 jsing Exp $ */ | 1 | /* $OpenBSD: p_open.c,v 1.18 2017/01/29 17:49:23 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 | * |
@@ -86,7 +86,7 @@ EVP_OpenInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *type, | |||
86 | return 1; | 86 | return 1; |
87 | 87 | ||
88 | if (priv->type != EVP_PKEY_RSA) { | 88 | if (priv->type != EVP_PKEY_RSA) { |
89 | EVPerr(EVP_F_EVP_OPENINIT, EVP_R_PUBLIC_KEY_NOT_RSA); | 89 | EVPerror(EVP_R_PUBLIC_KEY_NOT_RSA); |
90 | goto err; | 90 | goto err; |
91 | } | 91 | } |
92 | 92 | ||
@@ -94,7 +94,7 @@ EVP_OpenInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *type, | |||
94 | key = malloc(size + 2); | 94 | key = malloc(size + 2); |
95 | if (key == NULL) { | 95 | if (key == NULL) { |
96 | /* ERROR */ | 96 | /* ERROR */ |
97 | EVPerr(EVP_F_EVP_OPENINIT, ERR_R_MALLOC_FAILURE); | 97 | EVPerror(ERR_R_MALLOC_FAILURE); |
98 | goto err; | 98 | goto err; |
99 | } | 99 | } |
100 | 100 | ||