Set Enveloped data version to 2 if ktri version not zero.

(cherry picked from commit 9c5d953a07f472452ae2cb578e39eddea2de2b9c)

diff --git a/crypto/cms/cms_env.c b/crypto/cms/cms_env.c
index b398f6990b5980ca881f62b221aa17fb55505d78..ffb24a7c40df4d90a1c84f05874ca3609b551710 100644 (file)
--- a/crypto/cms/cms_env.c
+++ b/crypto/cms/cms_env.c
@@ -186,6 +186,8 @@ CMS_RecipientInfo *CMS_add1_recipient_cert(CMS_ContentInfo *cms,
        if (flags & CMS_USE_KEYID)
                {
                ktri->version = 2;
+               if (env->version < 2)
+                       env->version = 2;
                type = CMS_RECIPINFO_KEYIDENTIFIER;
                }
        else