aboutsummaryrefslogtreecommitdiff
path: root/crypto/pem
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>1999-10-25 02:00:09 +0000
committerDr. Stephen Henson <steve@openssl.org>1999-10-25 02:00:09 +0000
commitf769ce3ea41ba1c2b16f345722ed006861d51150 (patch)
tree5df2c631989beff5b5b28f01cc09c6c12e44ce02 /crypto/pem
parent042a93e443732418df4714d217ccc0b35cdc4eb5 (diff)
downloadopenssl-f769ce3ea41ba1c2b16f345722ed006861d51150.zip
openssl-f769ce3ea41ba1c2b16f345722ed006861d51150.tar.gz
openssl-f769ce3ea41ba1c2b16f345722ed006861d51150.tar.bz2
More multibyte character support.
Functions to get keys from EVP_PKEY structures.
Diffstat (limited to 'crypto/pem')
-rw-r--r--crypto/pem/pem_lib.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/crypto/pem/pem_lib.c b/crypto/pem/pem_lib.c
index 90f0201..3c86a23 100644
--- a/crypto/pem/pem_lib.c
+++ b/crypto/pem/pem_lib.c
@@ -179,7 +179,12 @@ char *PEM_ASN1_read_bio(char *(*d2i)(), const char *name, BIO *bp, char **x,
for (;;)
{
- if (!PEM_read_bio(bp,&nm,&header,&data,&len)) return(NULL);
+ if (!PEM_read_bio(bp,&nm,&header,&data,&len)) {
+ if(ERR_GET_REASON(ERR_peek_error()) ==
+ PEM_R_NO_START_LINE)
+ ERR_add_error_data(2, "Expecting: ", name);
+ return(NULL);
+ }
if ( (strcmp(nm,name) == 0) ||
((strcmp(nm,PEM_STRING_RSA) == 0) &&
(strcmp(name,PEM_STRING_EVP_PKEY) == 0)) ||