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/ecdsa/ecs_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/ecdsa/ecs_lib.c')
-rw-r--r-- | src/lib/libcrypto/ecdsa/ecs_lib.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/lib/libcrypto/ecdsa/ecs_lib.c b/src/lib/libcrypto/ecdsa/ecs_lib.c index 1ba788b4f0..ca0f51b366 100644 --- a/src/lib/libcrypto/ecdsa/ecs_lib.c +++ b/src/lib/libcrypto/ecdsa/ecs_lib.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ecs_lib.c,v 1.10 2015/09/10 15:56:25 jsing Exp $ */ | 1 | /* $OpenBSD: ecs_lib.c,v 1.11 2017/01/29 17:49:23 beck Exp $ */ |
2 | /* ==================================================================== | 2 | /* ==================================================================== |
3 | * Copyright (c) 1998-2005 The OpenSSL Project. All rights reserved. | 3 | * Copyright (c) 1998-2005 The OpenSSL Project. All rights reserved. |
4 | * | 4 | * |
@@ -113,7 +113,7 @@ ECDSA_DATA_new_method(ENGINE *engine) | |||
113 | 113 | ||
114 | ret = malloc(sizeof(ECDSA_DATA)); | 114 | ret = malloc(sizeof(ECDSA_DATA)); |
115 | if (ret == NULL) { | 115 | if (ret == NULL) { |
116 | ECDSAerr(ECDSA_F_ECDSA_DATA_NEW_METHOD, ERR_R_MALLOC_FAILURE); | 116 | ECDSAerror(ERR_R_MALLOC_FAILURE); |
117 | return (NULL); | 117 | return (NULL); |
118 | } | 118 | } |
119 | 119 | ||
@@ -127,8 +127,7 @@ ECDSA_DATA_new_method(ENGINE *engine) | |||
127 | if (ret->engine) { | 127 | if (ret->engine) { |
128 | ret->meth = ENGINE_get_ECDSA(ret->engine); | 128 | ret->meth = ENGINE_get_ECDSA(ret->engine); |
129 | if (!ret->meth) { | 129 | if (!ret->meth) { |
130 | ECDSAerr(ECDSA_F_ECDSA_DATA_NEW_METHOD, | 130 | ECDSAerror(ERR_R_ENGINE_LIB); |
131 | ERR_R_ENGINE_LIB); | ||
132 | ENGINE_finish(ret->engine); | 131 | ENGINE_finish(ret->engine); |
133 | free(ret); | 132 | free(ret); |
134 | return NULL; | 133 | return NULL; |