From: Dr. Stephen Henson <steve@openssl.org>
Date: Tue, 11 Nov 2008 12:38:25 +0000 (+0000)
Subject: Tolerate -----BEGIN PKCS #7 SIGNED DATA----- header lines as used by some
X-Git-Tag: OpenSSL_0_9_8k^2~169
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=2401debe83e8df930907a39065ebf9a54354f123;p=oweals%2Fopenssl.git

Tolerate -----BEGIN PKCS #7 SIGNED DATA----- header lines as used by some
implementations.
---

diff --git a/crypto/pem/pem.h b/crypto/pem/pem.h
index bff018f75f..fc9804eea5 100644
--- a/crypto/pem/pem.h
+++ b/crypto/pem/pem.h
@@ -125,6 +125,7 @@ extern "C" {
 #define PEM_STRING_DSA		"DSA PRIVATE KEY"
 #define PEM_STRING_DSA_PUBLIC	"DSA PUBLIC KEY"
 #define PEM_STRING_PKCS7	"PKCS7"
+#define PEM_STRING_PKCS7_SIGNED	"PKCS #7 SIGNED DATA"
 #define PEM_STRING_PKCS8	"ENCRYPTED PRIVATE KEY"
 #define PEM_STRING_PKCS8INF	"PRIVATE KEY"
 #define PEM_STRING_DHPARAMS	"DH PARAMETERS"
diff --git a/crypto/pem/pem_lib.c b/crypto/pem/pem_lib.c
index 43604d19ff..a547fdc933 100644
--- a/crypto/pem/pem_lib.c
+++ b/crypto/pem/pem_lib.c
@@ -256,6 +256,9 @@ static int check_pem(const char *nm, const char *name)
 	if(!strcmp(nm, PEM_STRING_X509) &&
 		!strcmp(name, PEM_STRING_PKCS7)) return 1;
 
+	if(!strcmp(nm, PEM_STRING_PKCS7_SIGNED) &&
+		!strcmp(name, PEM_STRING_PKCS7)) return 1;
+
 #ifndef OPENSSL_NO_CMS
 	if(!strcmp(nm, PEM_STRING_X509) &&
 		!strcmp(name, PEM_STRING_CMS)) return 1;