diff options
| author | Bob Beck <beck@cvs.openbsd.org> | 2017-01-29 17:49:24 +0000 |
|---|---|---|
| committer | Bob Beck <beck@cvs.openbsd.org> | 2017-01-29 17:49:24 +0000 |
| commit | c95f3b2c0c39020aafaffd84899a33ece0210769 (patch) | |
| tree | 6d6e55f6c8b4047319196f43823ad30170dfe061 /lib/libcrypto/evp/e_camellia.c | |
| parent | b8dd3a8e12bfab2c15794994bc5bdc1397125536 (diff) | |
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/e_camellia.c')
| -rw-r--r-- | lib/libcrypto/evp/e_camellia.c | 5 |
1 files changed, 2 insertions, 3 deletions
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; } |