From c95f3b2c0c39020aafaffd84899a33ece0210769 Mon Sep 17 00:00:00 2001 From: Bob Beck Date: Sun, 29 Jan 2017 17:49:24 +0000 Subject: 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@ --- lib/libcrypto/evp/e_camellia.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'lib/libcrypto/evp/e_camellia.c') diff --git a/lib/libcrypto/evp/e_camellia.c b/lib/libcrypto/evp/e_camellia.c index e3424cfe94a..fd12cf9c500 100644 --- a/lib/libcrypto/evp/e_camellia.c +++ b/lib/libcrypto/evp/e_camellia.c @@ -1,4 +1,4 @@ -/* $OpenBSD: e_camellia.c,v 1.7 2015/02/10 09:50:12 miod Exp $ */ +/* $OpenBSD: e_camellia.c,v 1.8 2017/01/29 17:49:23 beck Exp $ */ /* ==================================================================== * Copyright (c) 2006 The OpenSSL Project. All rights reserved. * @@ -114,8 +114,7 @@ camellia_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key, ret = Camellia_set_key(key, ctx->key_len * 8, ctx->cipher_data); if (ret < 0) { - EVPerr(EVP_F_CAMELLIA_INIT_KEY, - EVP_R_CAMELLIA_KEY_SETUP_FAILED); + EVPerror(EVP_R_CAMELLIA_KEY_SETUP_FAILED); return 0; } -- cgit v1.2.3