From: Dr. Stephen Henson <steve@openssl.org>
Date: Thu, 29 May 2014 13:07:49 +0000 (+0100)
Subject: Set version number correctly.
X-Git-Tag: OpenSSL_1_0_0m~18
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=fccbab6f312d409afa06b939d9fac6502e4b70ad;p=oweals%2Fopenssl.git

Set version number correctly.

PR#3249
(cherry picked from commit 8909bf20269035d295743fca559207ef2eb84eb3)
---

diff --git a/crypto/cms/cms_sd.c b/crypto/cms/cms_sd.c
index e3192b9c57..571e1ed961 100644
--- a/crypto/cms/cms_sd.c
+++ b/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)