diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2000-02-23 01:11:01 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2000-02-23 01:11:01 +0000 |
| commit | 3142c86d65a7da76d60622dcf1c177479d1bc9de (patch) | |
| tree | 9c2f6932de1df175c32cbeb55d52da011fde96ed /crypto/pem/pem_lib.c | |
| parent | 4b42658082a3d6224d25f10de8fdb605d30015a9 (diff) | |
| download | openssl-3142c86d65a7da76d60622dcf1c177479d1bc9de.tar.gz | |
Allow ADH to be used but not present in the default cipher
list.
Allow CERTIFICATE to be used in PEM headers for PKCS#7 structures:
some CAs do this.
Diffstat (limited to 'crypto/pem/pem_lib.c')
| -rw-r--r-- | crypto/pem/pem_lib.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/crypto/pem/pem_lib.c b/crypto/pem/pem_lib.c index 1b441d7852..072211ba0f 100644 --- a/crypto/pem/pem_lib.c +++ b/crypto/pem/pem_lib.c @@ -217,6 +217,10 @@ static int check_pem(const char *nm, const char *name) if(!strcmp(nm,PEM_STRING_X509_OLD) && !strcmp(name,PEM_STRING_X509_TRUSTED)) return 1; + /* Some CAs use PKCS#7 with CERTIFICATE headers */ + if(!strcmp(nm, PEM_STRING_X509) && + !strcmp(name, PEM_STRING_PKCS7)) return 1; + return 0; } |