Change C++ style comments

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

diff --git a/crypto/engine/eng_fat.c b/crypto/engine/eng_fat.c
index e101530ab1a127d538a2d4e85e6dc84804942c2e..c0d03ccbfe8e5a4d3ffe92debdf45daa18852bed 100644 (file)
--- a/crypto/engine/eng_fat.c
+++ b/crypto/engine/eng_fat.c
@@ -52,6 +52,11 @@
  * Hudson (tjh@cryptsoft.com).
  *
  */
+/* ====================================================================
+ * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
+ * ECDH support in OpenSSL originally developed by 
+ * SUN MICROSYSTEMS, INC., and contributed to the OpenSSL project.
+ */
 
 #include <openssl/crypto.h>
 #include "cryptlib.h"
@@ -76,6 +81,14 @@ int ENGINE_set_default(ENGINE *e, unsigned int flags)
 #ifndef OPENSSL_NO_DH
        if((flags & ENGINE_METHOD_DH) & !ENGINE_set_default_DH(e))
                return 0;
+#endif
+#ifndef OPENSSL_NO_ECDH
+       if((flags & ENGINE_METHOD_ECDH) & !ENGINE_set_default_ECDH(e))
+               return 0;
+#endif
+#ifndef OPENSSL_NO_ECDSA
+       if((flags & ENGINE_METHOD_ECDSA) & !ENGINE_set_default_ECDSA(e))
+               return 0;
 #endif
        if((flags & ENGINE_METHOD_RAND) & !ENGINE_set_default_RAND(e))
                return 0;
@@ -84,7 +97,7 @@ int ENGINE_set_default(ENGINE *e, unsigned int flags)
 
 /* Set default algorithms using a string */
 
-int int_def_cb(char *alg, int len, void *arg)
+static int int_def_cb(const char *alg, int len, void *arg)
        {
        unsigned int *pflags = arg;
        if (!strncmp(alg, "ALL", len))
@@ -93,6 +106,10 @@ int int_def_cb(char *alg, int len, void *arg)
                *pflags |= ENGINE_METHOD_RSA;
        else if (!strncmp(alg, "DSA", len))
                *pflags |= ENGINE_METHOD_DSA;
+       else if (!strncmp(alg, "ECDH", len))
+               *pflags |= ENGINE_METHOD_ECDH;
+       else if (!strncmp(alg, "ECDSA", len))
+               *pflags |= ENGINE_METHOD_ECDSA;
        else if (!strncmp(alg, "DH", len))
                *pflags |= ENGINE_METHOD_DH;
        else if (!strncmp(alg, "RAND", len))
@@ -107,7 +124,7 @@ int int_def_cb(char *alg, int len, void *arg)
        }
 
 
-int ENGINE_set_default_string(ENGINE *e, char *list)
+int ENGINE_set_default_string(ENGINE *e, const char *list)
        {
        unsigned int flags = 0;
        if (!CONF_parse_list(list, ',', 1, int_def_cb, &flags))
@@ -132,6 +149,12 @@ int ENGINE_register_complete(ENGINE *e)
 #endif
 #ifndef OPENSSL_NO_DH
        ENGINE_register_DH(e);
+#endif
+#ifndef OPENSSL_NO_ECDH
+       ENGINE_register_ECDH(e);
+#endif
+#ifndef OPENSSL_NO_ECDSA
+       ENGINE_register_ECDSA(e);
 #endif
        ENGINE_register_RAND(e);
        return 1;