diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2008-11-11 12:38:25 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2008-11-11 12:38:25 +0000 |
| commit | 2401debe83e8df930907a39065ebf9a54354f123 (patch) | |
| tree | 318a2c0e5f30752df3e9e1a0d0d405407d36ca39 /crypto/pem | |
| parent | 5c61111bff7daaac8973395fe62debcd1fd03946 (diff) | |
Tolerate -----BEGIN PKCS #7 SIGNED DATA----- header lines as used by some
implementations.
Diffstat (limited to 'crypto/pem')
| -rw-r--r-- | crypto/pem/pem.h | 1 | ||||
| -rw-r--r-- | crypto/pem/pem_lib.c | 3 |
2 files changed, 4 insertions, 0 deletions
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; |