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 bff018f75f6dc20e00788d7df07c46ca4e8542b0..fc9804eea57d167366dfe66d297281723d929b8a 100644 (file)
--- 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 43604d19ff85787e19851411e221009dedabd1cb..a547fdc9339acb2dd6be6e750b76adfd5f1f8ab7 100644 (file)
--- 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;