OpenSSL 0.9.4 merge

1 files changed, 39 insertions, 46 deletions

diff --git a/src/lib/libcrypto/cryptlib.c b/src/lib/libcrypto/cryptlib.c
index 9a7e80b7f8..356c476a99 100644
--- a/src/lib/libcrypto/cryptlib.c
+++ b/src/lib/libcrypto/cryptlib.c
@@ -59,15 +59,14 @@
 #include <stdio.h>
 #include <string.h>
 #include "cryptlib.h"
-#include "crypto.h"
-#include "date.h"
+#include <openssl/crypto.h>
 
 #if defined(WIN32) || defined(WIN16)
 static double SSLeay_MSVC5_hack=0.0; /* and for VC1.5 */
 #endif
 
 /* real #defines in crypto.h, keep these upto date */
-static char* lock_names[CRYPTO_NUM_LOCKS] =
+static const char* lock_names[CRYPTO_NUM_LOCKS] =
         {
         "<<ERROR>>",
         "err",
@@ -84,30 +83,28 @@ static char* lock_names[CRYPTO_NUM_LOCKS] =
         "ssl_ctx",
         "ssl_cert",
         "ssl_session",
+        "ssl_sess_cert",
         "ssl",
         "rand",
         "debug_malloc",
         "BIO",
-        "bio_gethostbyname",
+        "gethostbyname",
+        "getservbyname",
+        "readdir",
         "RSA_blinding",
+#if CRYPTO_NUM_LOCKS != 24
+# error "Inconsistency between crypto.h and cryptlib.c"
+#endif
         };
 
 static STACK *app_locks=NULL;
 
-#ifndef NOPROTO
 static void (MS_FAR *locking_callback)(int mode,int type,
-        char *file,int line)=NULL;
+        const char *file,int line)=NULL;
 static int (MS_FAR *add_lock_callback)(int *pointer,int amount,
-        int type,char *file,int line)=NULL;
+        int type,const char *file,int line)=NULL;
 static unsigned long (MS_FAR *id_callback)(void)=NULL;
-#else
-static void (MS_FAR *locking_callback)()=NULL;
-static int (MS_FAR *add_lock_callback)()=NULL;
-static unsigned long (MS_FAR *id_callback)()=NULL;
-#endif
-
-int CRYPTO_get_new_lockid(name)
-char *name;
+int CRYPTO_get_new_lockid(char *name)
         {
         char *str;
         int i;
@@ -120,10 +117,11 @@ char *name;
         SSLeay_MSVC5_hack=(double)name[0]*(double)name[1];
 #endif
 
-        if (app_locks == NULL)
-                if ((app_locks=sk_new_null()) == NULL)
-                        CRYPTOerr(CRYPTO_F_CRYPTO_GET_NEW_LOCKID,ERR_R_MALLOC_FAILURE);
-                        return(0);
+        if ((app_locks == NULL) && ((app_locks=sk_new_null()) == NULL))
+                {
+                CRYPTOerr(CRYPTO_F_CRYPTO_GET_NEW_LOCKID,ERR_R_MALLOC_FAILURE);
+                return(0);
+                }
         if ((str=BUF_strdup(name)) == NULL)
                 return(0);
         i=sk_push(app_locks,str);
@@ -134,40 +132,46 @@ char *name;
         return(i);
         }
 
-void (*CRYPTO_get_locking_callback(P_V))(P_I_I_P_I)
+int CRYPTO_num_locks(void)
+        {
+        return CRYPTO_NUM_LOCKS;
+        }
+
+void (*CRYPTO_get_locking_callback(void))(int mode,int type,const char *file,
+                int line)
         {
         return(locking_callback);
         }
 
-int (*CRYPTO_get_add_lock_callback(P_V))(P_IP_I_I_P_I)
+int (*CRYPTO_get_add_lock_callback(void))(int *num,int mount,int type,
+                                          const char *file,int line)
         {
         return(add_lock_callback);
         }
 
-void CRYPTO_set_locking_callback(func)
-void (*func)(P_I_I_P_I);
+void CRYPTO_set_locking_callback(void (*func)(int mode,int type,
+                                              const char *file,int line))
         {
         locking_callback=func;
         }
 
-void CRYPTO_set_add_lock_callback(func)
-int (*func)(P_IP_I_I_P_I);
+void CRYPTO_set_add_lock_callback(int (*func)(int *num,int mount,int type,
+                                              const char *file,int line))
         {
         add_lock_callback=func;
         }
 
-unsigned long (*CRYPTO_get_id_callback(P_V))(P_V)
+unsigned long (*CRYPTO_get_id_callback(void))(void)
         {
         return(id_callback);
         }
 
-void CRYPTO_set_id_callback(func)
-unsigned long (*func)(P_V);
+void CRYPTO_set_id_callback(unsigned long (*func)(void))
         {
         id_callback=func;
         }
 
-unsigned long CRYPTO_thread_id()
+unsigned long CRYPTO_thread_id(void)
         {
         unsigned long ret=0;
 
@@ -188,11 +192,7 @@ unsigned long CRYPTO_thread_id()
         return(ret);
         }
 
-void CRYPTO_lock(mode,type,file,line)
-int mode;
-int type;
-char *file;
-int line;
+void CRYPTO_lock(int mode, int type, const char *file, int line)
         {
 #ifdef LOCK_DEBUG
                 {
@@ -221,12 +221,8 @@ int line;
                 locking_callback(mode,type,file,line);
         }
 
-int CRYPTO_add_lock(pointer,amount,type,file,line)
-int *pointer;
-int amount;
-int type;
-char *file;
-int line;
+int CRYPTO_add_lock(int *pointer, int amount, int type, const char *file,
+             int line)
         {
         int ret;
 
@@ -264,8 +260,7 @@ int line;
         return(ret);
         }
 
-char *CRYPTO_get_lock_name(type)
-int type;
+const char *CRYPTO_get_lock_name(int type)
         {
         if (type < 0)
                 return("ERROR");
@@ -283,10 +278,8 @@ int type;
 /* All we really need to do is remove the 'error' state when a thread
  * detaches */
 
-BOOL WINAPI DLLEntryPoint(hinstDLL,fdwReason,lpvReserved)
-HINSTANCE hinstDLL;
-DWORD fdwReason;
-LPVOID lpvReserved;
+BOOL WINAPI DLLEntryPoint(HINSTANCE hinstDLL, DWORD fdwReason,
+             LPVOID lpvReserved)
         {
         switch(fdwReason)
                 {