summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/ecdh/ech_lib.c
diff options
context:
space:
mode:
authorbeck <>2017-01-29 17:49:23 +0000
committerbeck <>2017-01-29 17:49:23 +0000
commit957b11334a7afb14537322f0e4795b2e368b3f59 (patch)
tree1a54abba678898ee5270ae4f3404a50ee9a92eea /src/lib/libcrypto/ecdh/ech_lib.c
parentdf96e020e729c6c37a8c7fe311fdd1fe6a8718c5 (diff)
downloadopenbsd-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/ecdh/ech_lib.c')
-rw-r--r--src/lib/libcrypto/ecdh/ech_lib.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/libcrypto/ecdh/ech_lib.c b/src/lib/libcrypto/ecdh/ech_lib.c
index bb70d2d95f..06e6a1ee22 100644
--- a/src/lib/libcrypto/ecdh/ech_lib.c
+++ b/src/lib/libcrypto/ecdh/ech_lib.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ech_lib.c,v 1.11 2015/09/13 12:03:07 jsing Exp $ */ 1/* $OpenBSD: ech_lib.c,v 1.12 2017/01/29 17:49:23 beck Exp $ */
2/* ==================================================================== 2/* ====================================================================
3 * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED. 3 * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
4 * 4 *
@@ -125,7 +125,7 @@ ECDH_DATA_new_method(ENGINE *engine)
125 125
126 ret = malloc(sizeof(ECDH_DATA)); 126 ret = malloc(sizeof(ECDH_DATA));
127 if (ret == NULL) { 127 if (ret == NULL) {
128 ECDHerr(ECDH_F_ECDH_DATA_NEW_METHOD, ERR_R_MALLOC_FAILURE); 128 ECDHerror(ERR_R_MALLOC_FAILURE);
129 return (NULL); 129 return (NULL);
130 } 130 }
131 131
@@ -139,7 +139,7 @@ ECDH_DATA_new_method(ENGINE *engine)
139 if (ret->engine) { 139 if (ret->engine) {
140 ret->meth = ENGINE_get_ECDH(ret->engine); 140 ret->meth = ENGINE_get_ECDH(ret->engine);
141 if (!ret->meth) { 141 if (!ret->meth) {
142 ECDHerr(ECDH_F_ECDH_DATA_NEW_METHOD, ERR_R_ENGINE_LIB); 142 ECDHerror(ERR_R_ENGINE_LIB);
143 ENGINE_finish(ret->engine); 143 ENGINE_finish(ret->engine);
144 free(ret); 144 free(ret);
145 return NULL; 145 return NULL;