projects
/
oweals
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add a pointer to a paper (is the algorithm in section 4.2 the
[oweals/openssl.git]
/
crypto
/
cryptlib.c
diff --git
a/crypto/cryptlib.c
b/crypto/cryptlib.c
index b9586ce1bbc3f4011d0788ae52ad5f000b726065..a8f29f1e65c2ac938959920a45d2283ed27e1905 100644
(file)
--- a/
crypto/cryptlib.c
+++ b/
crypto/cryptlib.c
@@
-93,7
+93,8
@@
static const char* lock_names[CRYPTO_NUM_LOCKS] =
"readdir",
"RSA_blinding",
"dh",
"readdir",
"RSA_blinding",
"dh",
-#if CRYPTO_NUM_LOCKS != 25
+ "debug_malloc2",
+#if CRYPTO_NUM_LOCKS != 26
# error "Inconsistency between crypto.h and cryptlib.c"
#endif
};
# error "Inconsistency between crypto.h and cryptlib.c"
#endif
};
@@
-182,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();