diff options
| author |   beck <beck@openbsd.org> | 2017-01-29 17:49:22 +0000 |
|---|---|---|
| committer | beck <beck@openbsd.org> | 2017-01-29 17:49:22 +0000 |
| commit | 5067ae9f807f8af9e6350e51e6a54619386c06ba (patch) | |
| tree | f2455d670f0ea5c04a6e9cbdf4d8ef0d4ff40c47 /lib/libcrypto/dh/dh_lib.c | |
| parent | Ensure the build user can write to the GLOBAL_AUTOCONF_CACHE file by (diff) | |
| download | wireguard-openbsd-5067ae9f807f8af9e6350e51e6a54619386c06ba.tar.xz wireguard-openbsd-5067ae9f807f8af9e6350e51e6a54619386c06ba.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 'lib/libcrypto/dh/dh_lib.c')
| -rw-r--r-- | lib/libcrypto/dh/dh_lib.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/libcrypto/dh/dh_lib.c b/lib/libcrypto/dh/dh_lib.c index defe1c74b4f..d45dc171682 100644 --- a/lib/libcrypto/dh/dh_lib.c +++ b/lib/libcrypto/dh/dh_lib.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dh_lib.c,v 1.21 2015/02/11 03:19:37 doug Exp $ */ +/* $OpenBSD: dh_lib.c,v 1.22 2017/01/29 17:49:22 beck Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -121,7 +121,7 @@ DH_new_method(ENGINE *engine) ret = malloc(sizeof(DH)); if (ret == NULL) { - DHerr(DH_F_DH_NEW_METHOD, ERR_R_MALLOC_FAILURE); + DHerror(ERR_R_MALLOC_FAILURE); return NULL; } @@ -129,7 +129,7 @@ DH_new_method(ENGINE *engine) #ifndef OPENSSL_NO_ENGINE if (engine) { if (!ENGINE_init(engine)) { - DHerr(DH_F_DH_NEW_METHOD, ERR_R_ENGINE_LIB); + DHerror(ERR_R_ENGINE_LIB); free(ret); return NULL; } @@ -139,7 +139,7 @@ DH_new_method(ENGINE *engine) if(ret->engine) { ret->meth = ENGINE_get_DH(ret->engine); if (!ret->meth) { - DHerr(DH_F_DH_NEW_METHOD, ERR_R_ENGINE_LIB); + DHerror(ERR_R_ENGINE_LIB); ENGINE_finish(ret->engine); free(ret); return NULL; |