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

(cherry picked from commit 546b1b438468e629eea4e836190b1bb056e39286)

diff --git a/crypto/cms/cms_env.c b/crypto/cms/cms_env.c
index 8c6d91f3c88143e3c754c9833a26a57688753836..b6b6ca169665f47342159dc6b4e07d07f5164033 100644 (file)
--- a/crypto/cms/cms_env.c
+++ b/crypto/cms/cms_env.c
@@ -973,7 +973,7 @@ static void cms_env_set_version(CMS_EnvelopedData *env)
                        env->version = 3;
                        return;
                        }
-               else if (ri->type != CMS_RECIPINFO_TRANS)
+               else if (ri->type != CMS_RECIPINFO_TRANS || ri->d.ktri->version != 0)
                        {
                        env->version = 2;
                        }