mirror/openssl
2
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2025-02-17 14:32:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Providers: fix OSSL_FUNC_CIPHER_CIPHER functions

Browse Source 
This involves gcm_cipher() (providers/common/ciphers/cipher_gcm.c),
ccm_cipher() (providers/common/ciphers/cipher_ccm.c), and
tdes_wrap_cipher() (providers/common/ciphers/cipher_tdes_wrap.c)

These are generic implementations of the OSSL_FUNC_CIPHER_CIPHER
function, which returned -1 on error when they should return 0.

Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/10137)
This commit is contained in:
Richard Levitte 2019-10-10 18:14:33 +02:00
parent f7397f0d58
commit ff33581c67
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
providers/common/ciphers/cipher_ccm.c
View File

@ -278,11 +278,11 @@ int ccm_cipher(void *vctx,
if (outsize < inl) {
ERR_raise(ERR_LIB_PROV, PROV_R_OUTPUT_BUFFER_TOO_SMALL);
return -1;
return 0;
}
if (ccm_cipher_internal(ctx, out, outl, in, inl) <= 0)
return -1;
return 0;
*outl = inl;
return 1;

4
providers/common/ciphers/cipher_gcm.c
View File

@ -263,11 +263,11 @@ int gcm_cipher(void *vctx,
if (outsize < inl) {
ERR_raise(ERR_LIB_PROV, PROV_R_OUTPUT_BUFFER_TOO_SMALL);
return -1;
return 0;
}
if (gcm_cipher_internal(ctx, out, outl, in, inl) <= 0)
return -1;
return 0;
*outl = inl;
return 1;

2
providers/implementations/ciphers/cipher_tdes_wrap.c
View File

@ -131,7 +131,7 @@ static int tdes_wrap_cipher(void *vctx,
*outl = 0;
if (outsize < inl) {
PROVerr(0, PROV_R_OUTPUT_BUFFER_TOO_SMALL);
return -1;
return 0;
}
ret = tdes_wrap_cipher_internal(ctx, out, in, inl);