diff options
author | markus <> | 2002-09-05 22:44:52 +0000 |
---|---|---|
committer | markus <> | 2002-09-05 22:44:52 +0000 |
commit | 715a204e4615e4a70a466fcb383a9a57cad5e6b8 (patch) | |
tree | 2d2e93c4a34d1f7f04aba73706353332d7700641 /src/lib/libcrypto/pem | |
parent | 15b5d84f9da2ce4bfae8580e56e34a859f74ad71 (diff) | |
download | openbsd-715a204e4615e4a70a466fcb383a9a57cad5e6b8.tar.gz openbsd-715a204e4615e4a70a466fcb383a9a57cad5e6b8.tar.bz2 openbsd-715a204e4615e4a70a466fcb383a9a57cad5e6b8.zip |
import openssl-0.9.7-beta3
Diffstat (limited to 'src/lib/libcrypto/pem')
-rw-r--r-- | src/lib/libcrypto/pem/pem2.h | 2 | ||||
-rw-r--r-- | src/lib/libcrypto/pem/pem_pkey.c | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/src/lib/libcrypto/pem/pem2.h b/src/lib/libcrypto/pem/pem2.h index 4e484bcd82..f31790d69c 100644 --- a/src/lib/libcrypto/pem/pem2.h +++ b/src/lib/libcrypto/pem/pem2.h | |||
@@ -61,7 +61,9 @@ | |||
61 | extern "C" { | 61 | extern "C" { |
62 | #endif | 62 | #endif |
63 | 63 | ||
64 | #ifndef HEADER_PEM_H | ||
64 | void ERR_load_PEM_strings(void); | 65 | void ERR_load_PEM_strings(void); |
66 | #endif | ||
65 | 67 | ||
66 | #ifdef __cplusplus | 68 | #ifdef __cplusplus |
67 | } | 69 | } |
diff --git a/src/lib/libcrypto/pem/pem_pkey.c b/src/lib/libcrypto/pem/pem_pkey.c index 270892d72b..d96ecf6940 100644 --- a/src/lib/libcrypto/pem/pem_pkey.c +++ b/src/lib/libcrypto/pem/pem_pkey.c | |||
@@ -85,6 +85,7 @@ EVP_PKEY *PEM_read_bio_PrivateKey(BIO *bp, EVP_PKEY **x, pem_password_cb *cb, vo | |||
85 | else if (strcmp(nm,PEM_STRING_PKCS8INF) == 0) { | 85 | else if (strcmp(nm,PEM_STRING_PKCS8INF) == 0) { |
86 | PKCS8_PRIV_KEY_INFO *p8inf; | 86 | PKCS8_PRIV_KEY_INFO *p8inf; |
87 | p8inf=d2i_PKCS8_PRIV_KEY_INFO(NULL, &p, len); | 87 | p8inf=d2i_PKCS8_PRIV_KEY_INFO(NULL, &p, len); |
88 | if(!p8inf) goto p8err; | ||
88 | ret = EVP_PKCS82PKEY(p8inf); | 89 | ret = EVP_PKCS82PKEY(p8inf); |
89 | PKCS8_PRIV_KEY_INFO_free(p8inf); | 90 | PKCS8_PRIV_KEY_INFO_free(p8inf); |
90 | } else if (strcmp(nm,PEM_STRING_PKCS8) == 0) { | 91 | } else if (strcmp(nm,PEM_STRING_PKCS8) == 0) { |