From deecf17e93eed9b19a5e5259c8d5b03a6b23f12c Mon Sep 17 00:00:00 2001
From: miod <>
Date: Fri, 11 Jul 2014 13:02:10 +0000
Subject: Fix version number processing in cms_sd_set_version(); OpenSSL PR
 #3249 via OpenSSL trunk.

---
 src/lib/libcrypto/cms/cms_sd.c         | 6 +++---
 src/lib/libssl/src/crypto/cms/cms_sd.c | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'src/lib')

diff --git a/src/lib/libcrypto/cms/cms_sd.c b/src/lib/libcrypto/cms/cms_sd.c
index 63c3f69bae..7e490c0988 100644
--- a/src/lib/libcrypto/cms/cms_sd.c
+++ b/src/lib/libcrypto/cms/cms_sd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cms_sd.c,v 1.6 2014/07/11 08:44:48 jsing Exp $ */
+/* $OpenBSD: cms_sd.c,v 1.7 2014/07/11 13:02:10 miod Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project.
  */
@@ -150,8 +150,8 @@ cms_sd_set_version(CMS_SignedData *sd)
 				si->version = 3;
 			if (sd->version < 3)
 				sd->version = 3;
-		} else
-			sd->version = 1;
+		} else if (si->version < 1)
+			si->version = 1;
 	}
 
 	if (sd->version < 1)
diff --git a/src/lib/libssl/src/crypto/cms/cms_sd.c b/src/lib/libssl/src/crypto/cms/cms_sd.c
index 63c3f69bae..7e490c0988 100644
--- a/src/lib/libssl/src/crypto/cms/cms_sd.c
+++ b/src/lib/libssl/src/crypto/cms/cms_sd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cms_sd.c,v 1.6 2014/07/11 08:44:48 jsing Exp $ */
+/* $OpenBSD: cms_sd.c,v 1.7 2014/07/11 13:02:10 miod Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project.
  */
@@ -150,8 +150,8 @@ cms_sd_set_version(CMS_SignedData *sd)
 				si->version = 3;
 			if (sd->version < 3)
 				sd->version = 3;
-		} else
-			sd->version = 1;
+		} else if (si->version < 1)
+			si->version = 1;
 	}
 
 	if (sd->version < 1)
-- 
cgit v1.2.3-55-g6feb