From 08e012bbec24236bd7e8fb5e3ea4199f9583a750 Mon Sep 17 00:00:00 2001 From: "Dr. Stephen Henson" Date: Tue, 11 Nov 2008 12:42:32 +0000 Subject: [PATCH] Update from HEAD. --- crypto/pem/pem.h | 1 + crypto/pem/pem_lib.c | 3 +++ 2 files changed, 4 insertions(+) diff --git a/crypto/pem/pem.h b/crypto/pem/pem.h index 670afa670b..6f8e01544b 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 9bae4c8850..cbafefe416 100644 --- a/crypto/pem/pem_lib.c +++ b/crypto/pem/pem_lib.c @@ -216,6 +216,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; + return 0; } -- 2.25.1