Follow on from CVE-2014-3571. This fixes the code that was the original source

[oweals/openssl.git] / apps / genpkey.c

diff --git a/apps/genpkey.c b/apps/genpkey.c
index 722aa3ce675011ae53c0606f0ae5f8099715cfa1..685e2c6b162d38a7df76b7b14397d3740f390dea 100644 (file)
--- a/apps/genpkey.c
+++ b/apps/genpkey.c
@@ -1,5 +1,5 @@
 /* apps/genpkey.c */
-/* Written by Dr Stephen N Henson (shenson@bigfoot.com) for the OpenSSL
+/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 2006
  */
 /* ====================================================================
@@ -376,8 +376,10 @@ int init_gen_str(BIO *err, EVP_PKEY_CTX **pctx,
 
        ameth = EVP_PKEY_asn1_find_str(&tmpeng, algname, -1);
 
+#ifndef OPENSSL_NO_ENGINE
        if (!ameth && e)
                ameth = ENGINE_get_pkey_asn1_meth_str(e, algname, -1);
+#endif
 
        if (!ameth)
                {
@@ -431,8 +433,5 @@ static int genpkey_cb(EVP_PKEY_CTX *ctx)
        if (p == 3) c='\n';
        BIO_write(b,&c,1);
        (void)BIO_flush(b);
-#ifdef LINT
-       p=n;
-#endif
        return 1;
        }