Commit 08e012bb authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Update from HEAD.

parent b46acc39

crypto/pem/pem.h

+1 −0
Original line number Diff line number Diff line
@@ -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"

crypto/pem/pem_lib.c

+3 −0
Original line number Diff line number Diff line
@@ -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;

}