Reported by: Solar Designer of Openwall

Make sure tkeylen is initialised properly when encrypting CMS messages.

diff --git a/CHANGES b/CHANGES
index 577ac21be4f8b772eea66bee6494067dfcd1e104..046d80f0e509635013f9704835765e53350ec05b 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -54,6 +54,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.
      [Steve Henson]

diff --git a/crypto/cms/cms_enc.c b/crypto/cms/cms_enc.c
index 580083b45f870aebd3e21680cfe70d6d15260dfd..f873ce3794452a1ba64cbae3f98b68c09076f256 100644 (file)
--- 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);