The branch master has been updated via 2acdef5e97977958e9bb3b4a139039599ef1aefe (commit) via 891eac4604b5f05413e59602fae1f11136f4719a (commit) via a187e08d856690b5c1da3184d0ff560d572f893b (commit) from ade44dcb16141c8a30ca6c56a1fd1a0b14dcc360 (commit)
- Log ----------------------------------------------------------------- commit 2acdef5e97977958e9bb3b4a139039599ef1aefe Author: Dr. Stephen Henson <st...@openssl.org> Date: Sat Aug 1 15:38:11 2015 +0100 Return error for unsupported modes. PR#3974 PR#3975 Reviewed-by: Matt Caswell <m...@openssl.org> commit 891eac4604b5f05413e59602fae1f11136f4719a Author: Dr. Stephen Henson <st...@openssl.org> Date: Sat Aug 1 15:37:44 2015 +0100 Fix memory leak if setup fails. Reviewed-by: Matt Caswell <m...@openssl.org> commit a187e08d856690b5c1da3184d0ff560d572f893b Author: Dr. Stephen Henson <st...@openssl.org> Date: Sat Aug 1 15:37:01 2015 +0100 Err isn't always malloc failure. Reviewed-by: Matt Caswell <m...@openssl.org> ----------------------------------------------------------------------- Summary of changes: crypto/cms/cms_enc.c | 2 +- crypto/cms/cms_smime.c | 2 +- crypto/evp/evp_lib.c | 35 ++++++++++++++++++++++++++++++----- 3 files changed, 32 insertions(+), 7 deletions(-) diff --git a/crypto/cms/cms_enc.c b/crypto/cms/cms_enc.c index f9556ac..16b4225 100644 --- a/crypto/cms/cms_enc.c +++ b/crypto/cms/cms_enc.c @@ -194,7 +194,7 @@ BIO *cms_EncryptedContent_init_bio(CMS_EncryptedContentInfo *ec) ok = 1; err: - if (!keep_key) { + if (!keep_key || !ok) { OPENSSL_clear_free(ec->key, ec->keylen); ec->key = NULL; } diff --git a/crypto/cms/cms_smime.c b/crypto/cms/cms_smime.c index b33bc1d..6bed211 100644 --- a/crypto/cms/cms_smime.c +++ b/crypto/cms/cms_smime.c @@ -804,7 +804,7 @@ int CMS_final(CMS_ContentInfo *cms, BIO *data, BIO *dcont, unsigned int flags) int ret = 0; if ((cmsbio = CMS_dataInit(cms, dcont)) == NULL) { - CMSerr(CMS_F_CMS_FINAL, ERR_R_MALLOC_FAILURE); + CMSerr(CMS_F_CMS_FINAL, CMS_R_CMS_LIB); return 0; } diff --git a/crypto/evp/evp_lib.c b/crypto/evp/evp_lib.c index 1fdde9a..5ee3dcb 100644 --- a/crypto/evp/evp_lib.c +++ b/crypto/evp/evp_lib.c @@ -68,11 +68,22 @@ int EVP_CIPHER_param_to_asn1(EVP_CIPHER_CTX *c, ASN1_TYPE *type) if (c->cipher->set_asn1_parameters != NULL) ret = c->cipher->set_asn1_parameters(c, type); else if (c->cipher->flags & EVP_CIPH_FLAG_DEFAULT_ASN1) { - if (EVP_CIPHER_CTX_mode(c) == EVP_CIPH_WRAP_MODE) { + switch (EVP_CIPHER_CTX_mode(c)) { + case EVP_CIPH_WRAP_MODE: ASN1_TYPE_set(type, V_ASN1_NULL, NULL); ret = 1; - } else + break; + + case EVP_CIPH_GCM_MODE: + case EVP_CIPH_CCM_MODE: + case EVP_CIPH_XTS_MODE: + case EVP_CIPH_OCB_MODE: + ret = -1; + break; + + default: ret = EVP_CIPHER_set_asn1_iv(c, type); + } } else ret = -1; return (ret); @@ -85,9 +96,23 @@ int EVP_CIPHER_asn1_to_param(EVP_CIPHER_CTX *c, ASN1_TYPE *type) if (c->cipher->get_asn1_parameters != NULL) ret = c->cipher->get_asn1_parameters(c, type); else if (c->cipher->flags & EVP_CIPH_FLAG_DEFAULT_ASN1) { - if (EVP_CIPHER_CTX_mode(c) == EVP_CIPH_WRAP_MODE) - return 1; - ret = EVP_CIPHER_get_asn1_iv(c, type); + switch (EVP_CIPHER_CTX_mode(c)) { + + case EVP_CIPH_WRAP_MODE: + ret = 1; + break; + + case EVP_CIPH_GCM_MODE: + case EVP_CIPH_CCM_MODE: + case EVP_CIPH_XTS_MODE: + case EVP_CIPH_OCB_MODE: + ret = -1; + break; + + default: + ret = EVP_CIPHER_get_asn1_iv(c, type); + break; + } } else ret = -1; return (ret); _____ openssl-commits mailing list To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits