From 225055c30b625d9928fbc691f7362f4b1ed085e5 Mon Sep 17 00:00:00 2001 From: "Dr. Stephen Henson" Date: Thu, 10 May 2012 13:46:09 +0000 Subject: [PATCH] Reported by: Solar Designer of Openwall Make sure tkeylen is initialised properly when encrypting CMS messages. --- CHANGES | 4 ++++ crypto/cms/cms_enc.c | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGES b/CHANGES index 33c30602ed..8425bb37ea 100644 --- a/CHANGES +++ b/CHANGES @@ -291,6 +291,10 @@ Changes between 1.0.1b and 1.0.1c [xx XXX xxxx] + + *) Initialise tkeylen properly when encrypting CMS messages. + Thanks to Solar Designer of Openwall for reporting this issue. + [Steve Henson] *) In FIPS mode don't try to use composite ciphers as they are not approved. diff --git a/crypto/cms/cms_enc.c b/crypto/cms/cms_enc.c index 580083b45f..f873ce3794 100644 --- a/crypto/cms/cms_enc.c +++ b/crypto/cms/cms_enc.c @@ -139,10 +139,10 @@ BIO *cms_EncryptedContent_init_bio(CMS_EncryptedContentInfo *ec) CMS_R_CIPHER_PARAMETER_INITIALISATION_ERROR); goto err; } + tkeylen = EVP_CIPHER_CTX_key_length(ctx); /* Generate random session key */ if (!enc || !ec->key) { - tkeylen = EVP_CIPHER_CTX_key_length(ctx); tkey = OPENSSL_malloc(tkeylen); if (!tkey) { @@ -174,7 +174,7 @@ BIO *cms_EncryptedContent_init_bio(CMS_EncryptedContentInfo *ec) /* Only reveal failure if debugging so we don't * leak information which may be useful in MMA. */ - if (ec->debug) + if (enc || ec->debug) { CMSerr(CMS_F_CMS_ENCRYPTEDCONTENT_INIT_BIO, CMS_R_INVALID_KEY_LENGTH); -- 2.34.1