summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/dh/dh_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/dh/dh_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/dh/dh_lib.c')
-rw-r--r--src/lib/libcrypto/dh/dh_lib.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/libcrypto/dh/dh_lib.c b/src/lib/libcrypto/dh/dh_lib.c
index defe1c74b4..d45dc17168 100644
--- a/src/lib/libcrypto/dh/dh_lib.c
+++ b/src/lib/libcrypto/dh/dh_lib.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: dh_lib.c,v 1.21 2015/02/11 03:19:37 doug Exp $ */ 1/* $OpenBSD: dh_lib.c,v 1.22 2017/01/29 17:49:22 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 *
@@ -121,7 +121,7 @@ DH_new_method(ENGINE *engine)
121 121
122 ret = malloc(sizeof(DH)); 122 ret = malloc(sizeof(DH));
123 if (ret == NULL) { 123 if (ret == NULL) {
124 DHerr(DH_F_DH_NEW_METHOD, ERR_R_MALLOC_FAILURE); 124 DHerror(ERR_R_MALLOC_FAILURE);
125 return NULL; 125 return NULL;
126 } 126 }
127 127
@@ -129,7 +129,7 @@ DH_new_method(ENGINE *engine)
129#ifndef OPENSSL_NO_ENGINE 129#ifndef OPENSSL_NO_ENGINE
130 if (engine) { 130 if (engine) {
131 if (!ENGINE_init(engine)) { 131 if (!ENGINE_init(engine)) {
132 DHerr(DH_F_DH_NEW_METHOD, ERR_R_ENGINE_LIB); 132 DHerror(ERR_R_ENGINE_LIB);
133 free(ret); 133 free(ret);
134 return NULL; 134 return NULL;
135 } 135 }
@@ -139,7 +139,7 @@ DH_new_method(ENGINE *engine)
139 if(ret->engine) { 139 if(ret->engine) {
140 ret->meth = ENGINE_get_DH(ret->engine); 140 ret->meth = ENGINE_get_DH(ret->engine);
141 if (!ret->meth) { 141 if (!ret->meth) {
142 DHerr(DH_F_DH_NEW_METHOD, ERR_R_ENGINE_LIB); 142 DHerror(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;