summaryrefslogtreecommitdiffstats
path: root/crypto/cms
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2014-05-05 23:56:43 +0100
committerDr. Stephen Henson <steve@openssl.org>2014-05-06 14:00:11 +0100
commit1047b8c84df002b1dcad3f4ff642d466926ea071 (patch)
tree0d03aa4a32e6532c954717d12951331e773a4603 /crypto/cms
parent9740a03695f66e8d4e5b750791366c01e983d59a (diff)
Set Enveloped data version to 2 if ktri version not zero.
(cherry picked from commit 546b1b438468e629eea4e836190b1bb056e39286)
Diffstat (limited to 'crypto/cms')
-rw-r--r--crypto/cms/cms_env.c2
1 files changed, 1 insertions, 1 deletions
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;
}