projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sk_ENGINE_CLEANUP_ITEM_pop_free() is duplicated in ENGINE_cleanup().
[openssl.git]
/
crypto
/
cryptlib.c
diff --git
a/crypto/cryptlib.c
b/crypto/cryptlib.c
index b733abafeeea944b9cdb0c99f742a37e6070be4d..4eb584c90a5855c7ca643e73889fb079b3dddb86 100644
(file)
--- a/
crypto/cryptlib.c
+++ b/
crypto/cryptlib.c
@@
-74,7
+74,7
@@
static const char* lock_names[CRYPTO_NUM_LOCKS] =
{
"<<ERROR>>",
"err",
{
"<<ERROR>>",
"err",
- "e
rr_hash
",
+ "e
x_data
",
"x509",
"x509_info",
"x509_pkey",
"x509",
"x509_info",
"x509_pkey",
@@
-90,6
+90,7
@@
static const char* lock_names[CRYPTO_NUM_LOCKS] =
"ssl_sess_cert",
"ssl",
"rand",
"ssl_sess_cert",
"ssl",
"rand",
+ "rand2",
"debug_malloc",
"BIO",
"gethostbyname",
"debug_malloc",
"BIO",
"gethostbyname",
@@
-102,7
+103,7
@@
static const char* lock_names[CRYPTO_NUM_LOCKS] =
"dynlock",
"engine",
"ui",
"dynlock",
"engine",
"ui",
-#if CRYPTO_NUM_LOCKS != 3
0
+#if CRYPTO_NUM_LOCKS != 3
1
# error "Inconsistency between crypto.h and cryptlib.c"
#endif
};
# error "Inconsistency between crypto.h and cryptlib.c"
#endif
};