aboutsummaryrefslogtreecommitdiffstats
path: root/crypto/pem/pem_lib.c
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2008-11-11 12:38:25 +0000
committerDr. Stephen Henson <steve@openssl.org>2008-11-11 12:38:25 +0000
commit2401debe83e8df930907a39065ebf9a54354f123 (patch)
tree318a2c0e5f30752df3e9e1a0d0d405407d36ca39 /crypto/pem/pem_lib.c
parent5c61111bff7daaac8973395fe62debcd1fd03946 (diff)
downloadopenssl-2401debe83e8df930907a39065ebf9a54354f123.tar.gz
Tolerate -----BEGIN PKCS #7 SIGNED DATA----- header lines as used by some
implementations.
Diffstat (limited to 'crypto/pem/pem_lib.c')
-rw-r--r--crypto/pem/pem_lib.c3
1 files changed, 3 insertions, 0 deletions
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;