diff options
| author | beck <> | 2002-06-07 03:45:34 +0000 |
|---|---|---|
| committer | beck <> | 2002-06-07 03:45:34 +0000 |
| commit | 820a20ea2b5f97e4a8fb714fedf33edafd40740a (patch) | |
| tree | 595b35cf9e1ff104d11fb8ab64ebb6a5c5f42755 /src/lib/libcrypto/pem | |
| parent | d13d58e31ac54f9b283fe3ec100f31030e050fb4 (diff) | |
| download | openbsd-820a20ea2b5f97e4a8fb714fedf33edafd40740a.tar.gz openbsd-820a20ea2b5f97e4a8fb714fedf33edafd40740a.tar.bz2 openbsd-820a20ea2b5f97e4a8fb714fedf33edafd40740a.zip | |
Merge OpenSSL 0.9.7-stable-20020605,
correctly autogenerate obj_mac.h
Diffstat (limited to 'src/lib/libcrypto/pem')
| -rw-r--r-- | src/lib/libcrypto/pem/pem_pkey.c | 1 |
1 files changed, 1 insertions, 0 deletions
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) { |