giomba
/
opensc
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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-----"
This commit is contained in:
Aleksey Samsonov 2014-12-22 03:56:32 +03:00
parent 0d6ecd750e
commit 3084b3aa32
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/tools/pkcs11-tool.c
View File

@ -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);