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: master-post-reformat~767
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=46d889f33e9f1bb03afd84a92c4c9b47e1c1f880;p=oweals%2Fopenssl.git

Set version number correctly.

PR#3249
---

diff --git a/crypto/cms/cms_sd.c b/crypto/cms/cms_sd.c
index e8b2e1f889..ac5103abf7 100644
--- a/crypto/cms/cms_sd.c
+++ b/crypto/cms/cms_sd.c
@@ -159,8 +159,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)