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/rsa/rsa_lib.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/rsa/rsa_lib.c')
-rw-r--r-- | src/lib/libcrypto/rsa/rsa_lib.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/libcrypto/rsa/rsa_lib.c b/src/lib/libcrypto/rsa/rsa_lib.c index 51dc94a134..31ea418427 100644 --- a/src/lib/libcrypto/rsa/rsa_lib.c +++ b/src/lib/libcrypto/rsa/rsa_lib.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: rsa_lib.c,v 1.30 2015/02/11 03:19:37 doug Exp $ */ | 1 | /* $OpenBSD: rsa_lib.c,v 1.31 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 | * |
@@ -132,7 +132,7 @@ RSA_new_method(ENGINE *engine) | |||
132 | 132 | ||
133 | ret = malloc(sizeof(RSA)); | 133 | ret = malloc(sizeof(RSA)); |
134 | if (ret == NULL) { | 134 | if (ret == NULL) { |
135 | RSAerr(RSA_F_RSA_NEW_METHOD, ERR_R_MALLOC_FAILURE); | 135 | RSAerror(ERR_R_MALLOC_FAILURE); |
136 | return NULL; | 136 | return NULL; |
137 | } | 137 | } |
138 | 138 | ||
@@ -140,7 +140,7 @@ RSA_new_method(ENGINE *engine) | |||
140 | #ifndef OPENSSL_NO_ENGINE | 140 | #ifndef OPENSSL_NO_ENGINE |
141 | if (engine) { | 141 | if (engine) { |
142 | if (!ENGINE_init(engine)) { | 142 | if (!ENGINE_init(engine)) { |
143 | RSAerr(RSA_F_RSA_NEW_METHOD, ERR_R_ENGINE_LIB); | 143 | RSAerror(ERR_R_ENGINE_LIB); |
144 | free(ret); | 144 | free(ret); |
145 | return NULL; | 145 | return NULL; |
146 | } | 146 | } |
@@ -150,7 +150,7 @@ RSA_new_method(ENGINE *engine) | |||
150 | if (ret->engine) { | 150 | if (ret->engine) { |
151 | ret->meth = ENGINE_get_RSA(ret->engine); | 151 | ret->meth = ENGINE_get_RSA(ret->engine); |
152 | if (!ret->meth) { | 152 | if (!ret->meth) { |
153 | RSAerr(RSA_F_RSA_NEW_METHOD, ERR_R_ENGINE_LIB); | 153 | RSAerror(ERR_R_ENGINE_LIB); |
154 | ENGINE_finish(ret->engine); | 154 | ENGINE_finish(ret->engine); |
155 | free(ret); | 155 | free(ret); |
156 | return NULL; | 156 | return NULL; |