Confusion between algorithms resolved.

[openssl.git] / crypto / engine / engine_all.c

diff --git a/crypto/engine/engine_all.c b/crypto/engine/engine_all.c
index 28da0c6d1bf451762d8724b79436598a0c5a44f6..4d0244f351fc2c815e3da8f2be37ed6c057ebc12 100644 (file)
--- a/crypto/engine/engine_all.c
+++ b/crypto/engine/engine_all.c
@@ -56,49 +56,65 @@
  *
  */
 
+#include <openssl/err.h>
 #include <openssl/engine.h>
 #include "engine_int.h"
+
 static int engine_add(ENGINE *e)
        {
+       int toret = 1;
        if (!ENGINE_by_id(ENGINE_get_id(e)))
-               return ENGINE_add(e);
-       return 1;
+               {
+               (void)ERR_get_error();
+               toret = ENGINE_add(e);
+               }
+       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 OPENSSL_NO_HW
+#ifndef OPENSSL_NO_HW_UBSEC
+       engine_add(ENGINE_ubsec());
+#endif /* !OPENSSL_NO_HW_UBSEC */
+#endif /* !OPENSSL_NO_HW */
        }
 
 void ENGINE_load_builtin_engines(void)
@@ -112,4 +128,5 @@ void ENGINE_load_builtin_engines(void)
        ENGINE_load_chil();
        ENGINE_load_atalla();
        ENGINE_load_nuron();
+       ENGINE_load_ubsec();
        }