summaryrefslogtreecommitdiffstats
path: root/crypto
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2014-05-06 14:02:17 +0100
committerDr. Stephen Henson <steve@openssl.org>2014-05-06 14:05:05 +0100
commitf51f3741995dd4f50d4d80d8b8bcc37741f64729 (patch)
treea2015751da8496718993169162edee68ce4fa650 /crypto
parent3c1128f43fa92a5b6c16261617a7f5a55f00b417 (diff)
Set Enveloped data version to 2 if ktri version not zero.
(cherry picked from commit 9c5d953a07f472452ae2cb578e39eddea2de2b9c)
Diffstat (limited to 'crypto')
-rw-r--r--crypto/cms/cms_env.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/crypto/cms/cms_env.c b/crypto/cms/cms_env.c
index b8685fa175..f53336b5ff 100644
--- a/crypto/cms/cms_env.c
+++ b/crypto/cms/cms_env.c
@@ -185,6 +185,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