From: Dr. Stephen Henson <steve@openssl.org>
Date: Mon, 5 Jun 2006 12:38:22 +0000 (+0000)
Subject: Clarify comment and add #ifdef.
X-Git-Tag: OpenSSL_0_9_8k^2~1264
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=41eacc84a0988a9588a882459fb1aa36ed4f2ee8;p=oweals%2Fopenssl.git

Clarify comment and add #ifdef.
---

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,