projects
/
oweals
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
AFAICS lst1 stands for "lshift test" not "list".
[oweals/openssl.git]
/
crypto
/
cryptlib.c
diff --git
a/crypto/cryptlib.c
b/crypto/cryptlib.c
index 2810d3b10b6afc926931764fc2b0975a4ffefc72..a8f29f1e65c2ac938959920a45d2283ed27e1905 100644
(file)
--- a/
crypto/cryptlib.c
+++ b/
crypto/cryptlib.c
@@
-60,7
+60,6
@@
#include <string.h>
#include "cryptlib.h"
#include <openssl/crypto.h>
#include <string.h>
#include "cryptlib.h"
#include <openssl/crypto.h>
-#include "date.h"
#if defined(WIN32) || defined(WIN16)
static double SSLeay_MSVC5_hack=0.0; /* and for VC1.5 */
#if defined(WIN32) || defined(WIN16)
static double SSLeay_MSVC5_hack=0.0; /* and for VC1.5 */
@@
-84,12
+83,20
@@
static const char* lock_names[CRYPTO_NUM_LOCKS] =
"ssl_ctx",
"ssl_cert",
"ssl_session",
"ssl_ctx",
"ssl_cert",
"ssl_session",
+ "ssl_sess_cert",
"ssl",
"rand",
"debug_malloc",
"BIO",
"ssl",
"rand",
"debug_malloc",
"BIO",
- "bio_gethostbyname",
+ "gethostbyname",
+ "getservbyname",
+ "readdir",
"RSA_blinding",
"RSA_blinding",
+ "dh",
+ "debug_malloc2",
+#if CRYPTO_NUM_LOCKS != 26
+# error "Inconsistency between crypto.h and cryptlib.c"
+#endif
};
static STACK *app_locks=NULL;
};
static STACK *app_locks=NULL;
@@
-127,6
+134,11
@@
int CRYPTO_get_new_lockid(char *name)
return(i);
}
return(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)
{
void (*CRYPTO_get_locking_callback(void))(int mode,int type,const char *file,
int line)
{
@@
-151,12
+163,12
@@
void CRYPTO_set_add_lock_callback(int (*func)(int *num,int mount,int type,
add_lock_callback=func;
}
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);
}
{
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;
}
{
id_callback=func;
}
@@
-171,7
+183,7
@@
unsigned long CRYPTO_thread_id(void)
ret=(unsigned long)GetCurrentTask();
#elif defined(WIN32)
ret=(unsigned long)GetCurrentThreadId();
ret=(unsigned long)GetCurrentTask();
#elif defined(WIN32)
ret=(unsigned long)GetCurrentThreadId();
-#elif defined(
MSDO
S)
+#elif defined(
GETPID_IS_MEANINGLES
S)
ret=1L;
#else
ret=(unsigned long)getpid();
ret=1L;
#else
ret=(unsigned long)getpid();