new locks

[openssl.git] / crypto / crypto.h

diff --git a/crypto/crypto.h b/crypto/crypto.h
index b708a07dd47491cc66a742b027320a7373dd3fdc..0991cf294c28ade11bd00679d4ef89ccf4e2d399 100644 (file)
--- a/crypto/crypto.h
+++ b/crypto/crypto.h
@@ -97,7 +97,7 @@ extern "C" {
  */
 
 #define        CRYPTO_LOCK_ERR                 1
-#define        CRYPTO_LOCK_ERR_HASH            2
+#define        CRYPTO_LOCK_EX_DATA             2
 #define        CRYPTO_LOCK_X509                3
 #define        CRYPTO_LOCK_X509_INFO           4
 #define        CRYPTO_LOCK_X509_PKEY           5
@@ -126,8 +126,9 @@ extern "C" {
 #define        CRYPTO_LOCK_DYNLOCK             28
 #define        CRYPTO_LOCK_ENGINE              29
 #define        CRYPTO_LOCK_UI                  30
-#define        CRYPTO_LOCK_EX_DATA             31
-#define        CRYPTO_NUM_LOCKS                32
+#define CRYPTO_LOCK_ECDSA               31
+#define CRYPTO_LOCK_EC                 32
+#define        CRYPTO_NUM_LOCKS                33
 
 #define CRYPTO_LOCK            1
 #define CRYPTO_UNLOCK          2
@@ -234,6 +235,7 @@ DECLARE_STACK_OF(CRYPTO_EX_DATA_FUNCS)
 #define CRYPTO_EX_INDEX_ENGINE         9
 #define CRYPTO_EX_INDEX_X509           10
 #define CRYPTO_EX_INDEX_UI             11
+#define CRYPTO_EX_INDEX_ECDSA          12
 
 /* Dynamically assigned indexes start from this value (don't use directly, use
  * via CRYPTO_ex_data_new_class). */
@@ -392,6 +394,9 @@ int CRYPTO_push_info_(const char *info, const char *file, int line);
 int CRYPTO_pop_info(void);
 int CRYPTO_remove_all_info(void);
 
+
+/* Default debugging functions (enabled by CRYPTO_malloc_debug_init() macro;
+ * used as default in CRYPTO_MDEBUG compilations): */
 /* The last argument has the following significance:
  *
  * 0:  called before the actual memory allocation has taken place
@@ -400,18 +405,18 @@ int CRYPTO_remove_all_info(void);
 void CRYPTO_dbg_malloc(void *addr,int num,const char *file,int line,int before_p);
 void CRYPTO_dbg_realloc(void *addr1,void *addr2,int num,const char *file,int line,int before_p);
 void CRYPTO_dbg_free(void *addr,int before_p);
-
 /* Tell the debugging code about options.  By default, the following values
  * apply:
  *
- * 0:  Clear all options.
- * 1:  Set the "Show Time" option.
- * 2:  Set the "Show Thread Number" option.
- * 3:  1 + 2
+ * 0:                           Clear all options.
+ * V_CRYPTO_MDEBUG_TIME (1):    Set the "Show Time" option.
+ * V_CRYPTO_MDEBUG_THREAD (2):  Set the "Show Thread Number" option.
+ * V_CRYPTO_MDEBUG_ALL (3):     1 + 2
  */
 void CRYPTO_dbg_set_options(long bits);
 long CRYPTO_dbg_get_options(void);
 
+
 #ifndef OPENSSL_NO_FP_API
 void CRYPTO_mem_leaks_fp(FILE *);
 #endif
@@ -420,7 +425,6 @@ void CRYPTO_mem_leaks(struct bio_st *bio);
 typedef void *CRYPTO_MEM_LEAK_CB(unsigned long, const char *, int, int, void *);
 void CRYPTO_mem_leaks_cb(CRYPTO_MEM_LEAK_CB *cb);
 
-void ERR_load_CRYPTO_strings(void);
 
 /* BEGIN ERROR CODES */
 /* The following lines are auto generated by the script mkerr.pl. Any changes