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 | |
| parent | 01b8b3c7d2d8f835257ac1cb2512273aa27bfba8 (diff) | |
| download | openssl-41eacc84a0988a9588a882459fb1aa36ed4f2ee8.tar.gz | |
Clarify comment and add #ifdef.
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/asn1/d2i_pr.c | 4 | ||||
| -rw-r--r-- | crypto/engine/tb_asnmth.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/crypto/asn1/d2i_pr.c b/crypto/asn1/d2i_pr.c index b2791ea66e..0f0e6b1ae4 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)) diff --git a/crypto/engine/tb_asnmth.c b/crypto/engine/tb_asnmth.c index 2476d05912..8aaaf004f5 100644 --- a/crypto/engine/tb_asnmth.c +++ b/crypto/engine/tb_asnmth.c @@ -170,7 +170,7 @@ void engine_pkey_asn1_meths_free(ENGINE *e) /* Find a method based on a string. This does a linear search through * all implemented algorithms. This is OK in practice because only * a small number of algorithms are likely to be implemented in an engine - * and it is only used for non speed critical operations. + * and it is not used for speed critical operations. */ const EVP_PKEY_ASN1_METHOD *ENGINE_get_pkey_asn1_meth_str(ENGINE *e, |