From 3084b3aa3238e5529ce36a32bb2ecc3e8800576f Mon Sep 17 00:00:00 2001 From: Aleksey Samsonov Date: Mon, 22 Dec 2014 03:56:32 +0300 Subject: [PATCH] pkcs11-tool: fix mask for detect PEM format Make universal mask for choose input format from PEM or DER. Input file at PEM may be contain at start: "-----BEGIN RSA PRIVATE KEY-----" or "-----BEGIN PRIVATE KEY-----" --- src/tools/pkcs11-tool.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/tools/pkcs11-tool.c b/src/tools/pkcs11-tool.c index 8103f89a..d721c278 100644 --- a/src/tools/pkcs11-tool.c +++ b/src/tools/pkcs11-tool.c @@ -1823,13 +1823,13 @@ do_read_key(unsigned char *data, size_t data_len, int private, EVP_PKEY **key) BIO_set_mem_buf(mem, &buf_mem, BIO_NOCLOSE); if (private) { - if (!strstr((char *)data, "-----BEGIN PRIVATE KEY-----") && !strstr((char *)data, "-----BEGIN EC PRIVATE KEY-----")) + if (!strstr((char *)data, "-----BEGIN ")) *key = d2i_PrivateKey_bio(mem, NULL); else *key = PEM_read_bio_PrivateKey(mem, NULL, NULL, NULL); } else { - if (!strstr((char *)data, "-----BEGIN PUBLIC KEY-----") && !strstr((char *)data, "-----BEGIN EC PUBLIC KEY-----")) + if (!strstr((char *)data, "-----BEGIN ")) *key = d2i_PUBKEY_bio(mem, NULL); else *key = PEM_read_bio_PUBKEY(mem, NULL, NULL, NULL);