Clarify comment and add #ifdef.

This commit is contained in:
Dr. Stephen Henson 2006-06-05 12:38:22 +00:00
parent 01b8b3c7d2
commit 41eacc84a0
2 changed files with 5 additions and 1 deletions

View File

@ -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))

View File

@ -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,