From: Dr. Stephen Henson <steve@openssl.org>
Date: Mon, 5 May 2014 22:56:43 +0000 (+0100)
Subject: Set Enveloped data version to 2 if ktri version not zero.
X-Git-Tag: master-post-reformat~834
X-Git-Url: https://git.openssl.org/?p=openssl.git;a=commitdiff_plain;h=546b1b438468e629eea4e836190b1bb056e39286

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

diff --git a/crypto/cms/cms_env.c b/crypto/cms/cms_env.c
index 8c6d91f3c8..b6b6ca1696 100644
--- 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;
 			}