X-Git-Url: https://git.openssl.org/?p=openssl.git;a=blobdiff_plain;f=crypto%2Fengine%2Fengine_all.c;h=4d0244f351fc2c815e3da8f2be37ed6c057ebc12;hp=1d8acbf8222c522037afd315c0f959526a9778cd;hb=1690863acc891968cc483d6bf62438bc63284e5b;hpb=016d7d250afbc13b408287dd4628e41bfa71c14c

diff --git a/crypto/engine/engine_all.c b/crypto/engine/engine_all.c
index 1d8acbf822..4d0244f351 100644
--- a/crypto/engine/engine_all.c
+++ b/crypto/engine/engine_all.c
@@ -62,57 +62,59 @@
 
 static int engine_add(ENGINE *e)
 	{
+	int toret = 1;
 	if (!ENGINE_by_id(ENGINE_get_id(e)))
 		{
 		(void)ERR_get_error();
-		return ENGINE_add(e);
+		toret = ENGINE_add(e);
 		}
-	return 1;
+	ENGINE_free(e);
+	return toret;
 	}
 
 void ENGINE_load_cswift(void)
 	{
-#ifndef NO_HW
-#ifndef NO_HW_CSWIFT
+#ifndef OPENSSL_NO_HW
+#ifndef OPENSSL_NO_HW_CSWIFT
 	engine_add(ENGINE_cswift());
-#endif /* !NO_HW_CSWIFT */
-#endif /* !NO_HW */
+#endif /* !OPENSSL_NO_HW_CSWIFT */
+#endif /* !OPENSSL_NO_HW */
 	}
 
 void ENGINE_load_chil(void)
 	{
-#ifndef NO_HW
-#ifndef NO_HW_CSWIFT
+#ifndef OPENSSL_NO_HW
+#ifndef OPENSSL_NO_HW_CSWIFT
 	engine_add(ENGINE_ncipher());
-#endif /* !NO_HW_CSWIFT */
-#endif /* !NO_HW */
+#endif /* !OPENSSL_NO_HW_CSWIFT */
+#endif /* !OPENSSL_NO_HW */
 	}
 
 void ENGINE_load_atalla(void)
 	{
-#ifndef NO_HW
-#ifndef NO_HW_CSWIFT
+#ifndef OPENSSL_NO_HW
+#ifndef OPENSSL_NO_HW_CSWIFT
 	engine_add(ENGINE_atalla());
-#endif /* !NO_HW_CSWIFT */
-#endif /* !NO_HW */
+#endif /* !OPENSSL_NO_HW_CSWIFT */
+#endif /* !OPENSSL_NO_HW */
 	}
 
 void ENGINE_load_nuron(void)
 	{
-#ifndef NO_HW
-#ifndef NO_HW_CSWIFT
+#ifndef OPENSSL_NO_HW
+#ifndef OPENSSL_NO_HW_CSWIFT
 	engine_add(ENGINE_nuron());
-#endif /* !NO_HW_CSWIFT */
-#endif /* !NO_HW */
+#endif /* !OPENSSL_NO_HW_CSWIFT */
+#endif /* !OPENSSL_NO_HW */
 	}
 
 void ENGINE_load_ubsec(void)
 	{
-#ifndef NO_HW
-#ifndef NO_HW_UBSEC
+#ifndef OPENSSL_NO_HW
+#ifndef OPENSSL_NO_HW_UBSEC
 	engine_add(ENGINE_ubsec());
-#endif /* !NO_HW_UBSEC */
-#endif /* !NO_HW */
+#endif /* !OPENSSL_NO_HW_UBSEC */
+#endif /* !OPENSSL_NO_HW */
 	}
 
 void ENGINE_load_builtin_engines(void)