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/evp/p_open.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/evp/p_open.c')
| -rw-r--r-- | lib/libcrypto/evp/p_open.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/libcrypto/evp/p_open.c b/lib/libcrypto/evp/p_open.c index 002a6dea706..1eb238dfdec 100644 --- a/lib/libcrypto/evp/p_open.c +++ b/lib/libcrypto/evp/p_open.c @@ -1,4 +1,4 @@ -/* $OpenBSD: p_open.c,v 1.17 2015/09/10 15:56:25 jsing Exp $ */ +/* $OpenBSD: p_open.c,v 1.18 2017/01/29 17:49:23 beck Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -86,7 +86,7 @@ EVP_OpenInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *type, return 1; if (priv->type != EVP_PKEY_RSA) { - EVPerr(EVP_F_EVP_OPENINIT, EVP_R_PUBLIC_KEY_NOT_RSA); + EVPerror(EVP_R_PUBLIC_KEY_NOT_RSA); goto err; } @@ -94,7 +94,7 @@ EVP_OpenInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *type, key = malloc(size + 2); if (key == NULL) { /* ERROR */ - EVPerr(EVP_F_EVP_OPENINIT, ERR_R_MALLOC_FAILURE); + EVPerror(ERR_R_MALLOC_FAILURE); goto err; } |