summaryrefslogtreecommitdiffstats
path: root/crypto/cms
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:02:38 +0100
commit9c5d953a07f472452ae2cb578e39eddea2de2b9c (patch)
tree3692e549abe9beec4a2505fcc9fa6b5d62f2d657 /crypto/cms
parent7b7b18c57e899201338d91083bc49cc8c5a915fc (diff)
Set Enveloped data version to 2 if ktri version not zero.
Diffstat (limited to 'crypto/cms')
-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 be20b1c024..add00bf99c 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