Typo...

[oweals/openssl.git] / engines / e_aep.c

diff --git a/engines/e_aep.c b/engines/e_aep.c
index 8b8380a582b4d1432a76862a70ef6aff952652ce..5083c80ef805c57a2e7357288f312f44ef5f4d99 100644 (file)
--- a/engines/e_aep.c
+++ b/engines/e_aep.c
@@ -84,11 +84,11 @@ typedef int pid_t;
 #define AEP_LIB_NAME "aep engine"
 #define FAIL_TO_SW 0x10101010
 
-#include "hw_aep_err.c"
+#include "e_aep_err.c"
 
 static int aep_init(ENGINE *e);
 static int aep_finish(ENGINE *e);
-static int aep_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f)());
+static int aep_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f)(void));
 static int aep_destroy(ENGINE *e);
 
 static AEP_RV aep_get_connection(AEP_CONNECTION_HNDL_PTR hConnection);
@@ -172,7 +172,8 @@ static RSA_METHOD aep_rsa =
        0,                   /*flags*/
        NULL,                /*app_data*/
        NULL,                /*rsa_sign*/
-       NULL                 /*rsa_verify*/
+       NULL,                /*rsa_verify*/
+       NULL                 /*rsa_keygen*/
        };
 #endif
 
@@ -189,7 +190,9 @@ static DSA_METHOD aep_dsa =
        NULL,                /* init */
        NULL,                /* finish */
        0,                   /* flags */
-       NULL                 /* app_data */
+       NULL,                /* app_data */
+       NULL,                /* dsa_paramgen */
+       NULL                 /* dsa_keygen */
        };
 #endif
 
@@ -204,6 +207,7 @@ static DH_METHOD aep_dh =
        NULL,
        NULL,
        0,
+       NULL,
        NULL
        };
 #endif
@@ -318,7 +322,7 @@ static int bind_aep(ENGINE *e)
        return 1;
 }
 
-#ifdef ENGINE_DYNAMIC_SUPPORT
+#ifndef OPENSSL_NO_DYNAMIC_ENGINE
 static int bind_helper(ENGINE *e, const char *id)
        {
        if(id && (strcmp(id, engine_aep_id) != 0))
@@ -550,7 +554,7 @@ static int aep_finish(ENGINE *e)
        return to_return;
        }
 
-static int aep_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f)())
+static int aep_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f)(void))
        {
        int initialised = ((aep_dso == NULL) ? 0 : 1);
        switch(cmd)
@@ -848,7 +852,11 @@ static AEP_RV aep_get_connection(AEP_CONNECTION_HNDL_PTR phConnection)
 
        CRYPTO_w_lock(CRYPTO_LOCK_ENGINE);
 
+#ifndef NETWARE_CLIB
        curr_pid = getpid();
+#else
+       curr_pid = GetThreadID();
+#endif
 
        /*Check if this is the first time this is being called from the current
          process*/