summaryrefslogtreecommitdiff
path: root/app/openssl/crypto/cms/cms_sd.c
diff options
context:
space:
mode:
authorParménides GV <parmegv@sdf.org>2014-11-25 13:19:21 +0100
committerParménides GV <parmegv@sdf.org>2014-11-25 13:19:21 +0100
commit576b0c26baf9b5b1418650a572604325ca7fb3af (patch)
tree8b2986d66ed4e6bdf5a3253c81f32cc5a8e53b99 /app/openssl/crypto/cms/cms_sd.c
parentbbf877a099112acbf34589b01503c3f5ee135dc0 (diff)
parent48cd0f2fa3094b5a6b7b07d6413d77bdbc9bbc20 (diff)
Merge branch 'develop'0.8.0
Diffstat (limited to 'app/openssl/crypto/cms/cms_sd.c')
-rw-r--r--app/openssl/crypto/cms/cms_sd.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/openssl/crypto/cms/cms_sd.c b/app/openssl/crypto/cms/cms_sd.c
index 77fbd135..51dd33a1 100644
--- a/app/openssl/crypto/cms/cms_sd.c
+++ b/app/openssl/crypto/cms/cms_sd.c
@@ -158,8 +158,8 @@ static void cms_sd_set_version(CMS_SignedData *sd)
if (sd->version < 3)
sd->version = 3;
}
- else
- sd->version = 1;
+ else if (si->version < 1)
+ si->version = 1;
}
if (sd->version < 1)