diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2006-06-05 12:38:22 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2006-06-05 12:38:22 +0000 |
| commit | 41eacc84a0988a9588a882459fb1aa36ed4f2ee8 (patch) | |
| tree | 2500c41a9e0c8521ad5b34005ea39bf67e3e6b15 /crypto/asn1/d2i_pr.c | |
| parent | 01b8b3c7d2d8f835257ac1cb2512273aa27bfba8 (diff) | |
| download | openssl-41eacc84a0988a9588a882459fb1aa36ed4f2ee8.zip openssl-41eacc84a0988a9588a882459fb1aa36ed4f2ee8.tar.gz openssl-41eacc84a0988a9588a882459fb1aa36ed4f2ee8.tar.bz2 | |
Clarify comment and add #ifdef.
Diffstat (limited to 'crypto/asn1/d2i_pr.c')
| -rw-r--r-- | crypto/asn1/d2i_pr.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/crypto/asn1/d2i_pr.c b/crypto/asn1/d2i_pr.c index b2791ea..0f0e6b1 100644 --- a/crypto/asn1/d2i_pr.c +++ b/crypto/asn1/d2i_pr.c @@ -61,7 +61,9 @@ #include <openssl/bn.h> #include <openssl/evp.h> #include <openssl/objects.h> +#include OPENSSL_NO_ENGINE #include <openssl/engine.h> +#endif #include <openssl/asn1.h> #include "asn1_locl.h" @@ -81,11 +83,13 @@ EVP_PKEY *d2i_PrivateKey(int type, EVP_PKEY **a, const unsigned char **pp, else { ret= *a; +#ifndef OPENSSL_NO_ENGINE if (ret->engine) { ENGINE_finish(ret->engine); ret->engine = NULL; } +#endif } if (!EVP_PKEY_set_type(ret, type)) |