X-Git-Url: https://git.openssl.org/gitweb/?a=blobdiff_plain;f=include%2Fopenssl%2Fcrypto.h;h=d010bfae110724b59abb05af4926ac72cdbaf1e4;hb=0b1a07c8a70486534526d8967f03e32806da5661;hp=dd1089dc6c73ef2b653c67b37ecd612d32ca7add;hpb=b184e3ef73200cb3b7914a603b43a5b8a074c85f;p=openssl.git diff --git a/include/openssl/crypto.h b/include/openssl/crypto.h index dd1089dc6c..d010bfae11 100644 --- a/include/openssl/crypto.h +++ b/include/openssl/crypto.h @@ -1,5 +1,5 @@ /* ==================================================================== - * Copyright (c) 1998-2006 The OpenSSL Project. All rights reserved. + * Copyright (c) 1998-2016 The OpenSSL Project. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -165,42 +165,14 @@ extern "C" { * names in cryptlib.c */ -# define CRYPTO_LOCK_ERR 1 -# define CRYPTO_LOCK_EX_DATA 2 -# define CRYPTO_LOCK_X509 3 -# define CRYPTO_LOCK_X509_INFO 4 -# define CRYPTO_LOCK_X509_PKEY 5 -# define CRYPTO_LOCK_X509_CRL 6 -# define CRYPTO_LOCK_X509_REQ 7 -# define CRYPTO_LOCK_DSA 8 -# define CRYPTO_LOCK_RSA 9 -# define CRYPTO_LOCK_EVP_PKEY 10 # define CRYPTO_LOCK_X509_STORE 11 -# define CRYPTO_LOCK_SSL_CTX 12 -# define CRYPTO_LOCK_SSL_CERT 13 -# define CRYPTO_LOCK_SSL_SESSION 14 -# define CRYPTO_LOCK_SSL_SESS_CERT 15 -# define CRYPTO_LOCK_SSL 16 -# define CRYPTO_LOCK_SSL_METHOD 17 # define CRYPTO_LOCK_RAND 18 # define CRYPTO_LOCK_RAND2 19 -# define CRYPTO_LOCK_MALLOC 20 -# define CRYPTO_LOCK_BIO 21 -# define CRYPTO_LOCK_GETHOSTBYNAME 22 -# define CRYPTO_LOCK_GETSERVBYNAME 23 -# define CRYPTO_LOCK_READDIR 24 -# define CRYPTO_LOCK_RSA_BLINDING 25 -# define CRYPTO_LOCK_DH 26 -# define CRYPTO_LOCK_MALLOC2 27 -# define CRYPTO_LOCK_DSO 28 # define CRYPTO_LOCK_DYNLOCK 29 # define CRYPTO_LOCK_ENGINE 30 -# define CRYPTO_LOCK_UI 31 # define CRYPTO_LOCK_ECDSA 32 -# define CRYPTO_LOCK_EC 33 # define CRYPTO_LOCK_ECDH 34 # define CRYPTO_LOCK_BN 35 -# define CRYPTO_LOCK_EC_PRE_COMP 36 # define CRYPTO_LOCK_STORE 37 # define CRYPTO_LOCK_COMP 38 # define CRYPTO_LOCK_FIPS 39 @@ -215,15 +187,15 @@ extern "C" { # ifndef OPENSSL_NO_LOCKING # ifndef CRYPTO_w_lock # define CRYPTO_w_lock(type) \ - CRYPTO_lock(CRYPTO_LOCK|CRYPTO_WRITE,type,__FILE__,__LINE__) + CRYPTO_lock(CRYPTO_LOCK|CRYPTO_WRITE,type,OPENSSL_FILE,OPENSSL_LINE) # define CRYPTO_w_unlock(type) \ - CRYPTO_lock(CRYPTO_UNLOCK|CRYPTO_WRITE,type,__FILE__,__LINE__) + CRYPTO_lock(CRYPTO_UNLOCK|CRYPTO_WRITE,type,OPENSSL_FILE,OPENSSL_LINE) # define CRYPTO_r_lock(type) \ - CRYPTO_lock(CRYPTO_LOCK|CRYPTO_READ,type,__FILE__,__LINE__) + CRYPTO_lock(CRYPTO_LOCK|CRYPTO_READ,type,OPENSSL_FILE,OPENSSL_LINE) # define CRYPTO_r_unlock(type) \ - CRYPTO_lock(CRYPTO_UNLOCK|CRYPTO_READ,type,__FILE__,__LINE__) + CRYPTO_lock(CRYPTO_UNLOCK|CRYPTO_READ,type,OPENSSL_FILE,OPENSSL_LINE) # define CRYPTO_add(addr,amount,type) \ - CRYPTO_add_lock(addr,amount,type,__FILE__,__LINE__) + CRYPTO_add_lock(addr,amount,type,OPENSSL_FILE,OPENSSL_LINE) # endif # else # define CRYPTO_w_lock(a) @@ -244,6 +216,16 @@ typedef struct { struct CRYPTO_dynlock_value *data; } CRYPTO_dynlock; +typedef void CRYPTO_RWLOCK; + +CRYPTO_RWLOCK *CRYPTO_THREAD_lock_new(void); +int CRYPTO_THREAD_read_lock(CRYPTO_RWLOCK *lock); +int CRYPTO_THREAD_write_lock(CRYPTO_RWLOCK *lock); +int CRYPTO_THREAD_unlock(CRYPTO_RWLOCK *lock); +void CRYPTO_THREAD_lock_free(CRYPTO_RWLOCK *lock); + +int CRYPTO_atomic_add(int *val, int amount, int *ret, CRYPTO_RWLOCK *lock); + /* * The following can be used to detect memory leaks in the library. If * used, it turns on malloc checking @@ -291,62 +273,32 @@ DEFINE_STACK_OF(void) int CRYPTO_mem_ctrl(int mode); -# ifndef OPENSSL_NO_CRYPTO_MDEBUG -# define OPENSSL_malloc(num) \ - CRYPTO_malloc(num, __FILE__, __LINE__) -# define OPENSSL_zalloc(num) \ - CRYPTO_zalloc(num, __FILE__, __LINE__) -# define OPENSSL_realloc(addr, num) \ - CRYPTO_realloc(addr, num, __FILE__, __LINE__) -# define OPENSSL_clear_realloc(addr, old_num, num) \ - CRYPTO_clear_realloc(addr, old_num, num, __FILE__, __LINE__) -# define OPENSSL_clear_free(addr, num) \ - CRYPTO_clear_free(addr, num) -# define OPENSSL_free(addr) \ - CRYPTO_free(addr) -# define OPENSSL_memdup(str, s) \ - CRYPTO_memdup((str), s, __FILE__, __LINE__) -# define OPENSSL_strdup(str) \ - CRYPTO_strdup(str, __FILE__, __LINE__) -# define OPENSSL_strndup(str, n) \ - CRYPTO_strndup(str, n, __FILE__, __LINE__) -# define OPENSSL_secure_malloc(num) \ - CRYPTO_secure_malloc(num, __FILE__, __LINE__) -# define OPENSSL_secure_zalloc(num) \ - CRYPTO_secure_zalloc(num, __FILE__, __LINE__) -# define OPENSSL_secure_free(addr) \ - CRYPTO_secure_free(addr) -# define OPENSSL_secure_actual_size(ptr) \ +# define OPENSSL_malloc(num) \ + CRYPTO_malloc(num, OPENSSL_FILE, OPENSSL_LINE) +# define OPENSSL_zalloc(num) \ + CRYPTO_zalloc(num, OPENSSL_FILE, OPENSSL_LINE) +# define OPENSSL_realloc(addr, num) \ + CRYPTO_realloc(addr, num, OPENSSL_FILE, OPENSSL_LINE) +# define OPENSSL_clear_realloc(addr, old_num, num) \ + CRYPTO_clear_realloc(addr, old_num, num, OPENSSL_FILE, OPENSSL_LINE) +# define OPENSSL_clear_free(addr, num) \ + CRYPTO_clear_free(addr, num, OPENSSL_FILE, OPENSSL_LINE) +# define OPENSSL_free(addr) \ + CRYPTO_free(addr, OPENSSL_FILE, OPENSSL_LINE) +# define OPENSSL_memdup(str, s) \ + CRYPTO_memdup((str), s, OPENSSL_FILE, OPENSSL_LINE) +# define OPENSSL_strdup(str) \ + CRYPTO_strdup(str, OPENSSL_FILE, OPENSSL_LINE) +# define OPENSSL_strndup(str, n) \ + CRYPTO_strndup(str, n, OPENSSL_FILE, OPENSSL_LINE) +# define OPENSSL_secure_malloc(num) \ + CRYPTO_secure_malloc(num, OPENSSL_FILE, OPENSSL_LINE) +# define OPENSSL_secure_zalloc(num) \ + CRYPTO_secure_zalloc(num, OPENSSL_FILE, OPENSSL_LINE) +# define OPENSSL_secure_free(addr) \ + CRYPTO_secure_free(addr, OPENSSL_FILE, OPENSSL_LINE) +# define OPENSSL_secure_actual_size(ptr) \ CRYPTO_secure_actual_size(ptr) -# else -# define OPENSSL_malloc(num) \ - CRYPTO_malloc(num, NULL, 0) -# define OPENSSL_zalloc(num) \ - CRYPTO_zalloc(num, NULL, 0) -# define OPENSSL_realloc(addr, num) \ - CRYPTO_realloc(addr, num, NULL, 0) -# define OPENSSL_clear_realloc(addr, old_num, num) \ - CRYPTO_clear_realloc(addr, old_num, num, NULL, 0) -# define OPENSSL_clear_free(addr, num) \ - CRYPTO_clear_free(addr, num) -# define OPENSSL_free(addr) \ - CRYPTO_free(addr) -# define OPENSSL_memdup(str, s) \ - CRYPTO_memdup(str, s, NULL, 0) -# define OPENSSL_strdup(str) \ - CRYPTO_strdup(str, NULL, 0) -# define OPENSSL_strndup(str, s) \ - CRYPTO_strndup(str, s, NULL, 0) -# define OPENSSL_secure_malloc(num) \ - CRYPTO_secure_malloc(num, NULL, 0) -# define OPENSSL_secure_zalloc(num) \ - CRYPTO_secure_zalloc(num, NULL, 0) -# define OPENSSL_secure_free(addr) \ - CRYPTO_secure_free(addr) -# define OPENSSL_secure_actual_size(ptr) \ - CRYPTO_secure_actual_size(ptr) - -# endif size_t OPENSSL_strlcpy(char *dst, const char *src, size_t siz); size_t OPENSSL_strlcat(char *dst, const char *src, size_t siz); @@ -361,6 +313,7 @@ const char *OpenSSL_version(int type); # define OPENSSL_BUILT_ON 2 # define OPENSSL_PLATFORM 3 # define OPENSSL_DIR 4 +# define OPENSSL_ENGINES_DIR 5 int OPENSSL_issetugid(void); @@ -461,20 +414,20 @@ void (*CRYPTO_get_dynlock_destroy_callback(void)) (struct CRYPTO_dynlock_value int CRYPTO_set_mem_functions( void *(*m) (size_t, const char *, int), void *(*r) (void *, size_t, const char *, int), - void (*f) (void *)); + void (*f) (void *, const char *, int)); int CRYPTO_set_mem_debug(int flag); void CRYPTO_get_mem_functions( void *(**m) (size_t, const char *, int), void *(**r) (void *, size_t, const char *, int), - void (**f) (void *)); + void (**f) (void *, const char *, int)); void *CRYPTO_malloc(size_t num, const char *file, int line); void *CRYPTO_zalloc(size_t num, const char *file, int line); void *CRYPTO_memdup(const void *str, size_t siz, const char *file, int line); char *CRYPTO_strdup(const char *str, const char *file, int line); char *CRYPTO_strndup(const char *str, size_t s, const char *file, int line); -void CRYPTO_free(void *ptr); -void CRYPTO_clear_free(void *ptr, size_t num); +void CRYPTO_free(void *ptr, const char *file, int line); +void CRYPTO_clear_free(void *ptr, size_t num, const char *file, int line); void *CRYPTO_realloc(void *addr, size_t num, const char *file, int line); void *CRYPTO_clear_realloc(void *addr, size_t old_num, size_t num, const char *file, int line); @@ -483,7 +436,7 @@ int CRYPTO_secure_malloc_init(size_t sz, int minsize); void CRYPTO_secure_malloc_done(void); void *CRYPTO_secure_malloc(size_t num, const char *file, int line); void *CRYPTO_secure_zalloc(size_t num, const char *file, int line); -void CRYPTO_secure_free(void *ptr); +void CRYPTO_secure_free(void *ptr, const char *file, int line); int CRYPTO_secure_allocated(const void *ptr); int CRYPTO_secure_malloc_initialized(void); size_t CRYPTO_secure_actual_size(void *ptr); @@ -493,7 +446,7 @@ void OPENSSL_cleanse(void *ptr, size_t len); # ifndef OPENSSL_NO_CRYPTO_MDEBUG # define OPENSSL_mem_debug_push(info) \ - CRYPTO_mem_debug_push(info, __FILE__, __LINE__) + CRYPTO_mem_debug_push(info, OPENSSL_FILE, OPENSSL_LINE) # define OPENSSL_mem_debug_pop() \ CRYPTO_mem_debug_pop() int CRYPTO_mem_debug_push(const char *info, const char *file, int line); @@ -509,7 +462,8 @@ void CRYPTO_mem_debug_malloc(void *addr, size_t num, int flag, const char *file, int line); void CRYPTO_mem_debug_realloc(void *addr1, void *addr2, size_t num, int flag, const char *file, int line); -void CRYPTO_mem_debug_free(void *addr, int flag); +void CRYPTO_mem_debug_free(void *addr, int flag, + const char *file, int line); # ifndef OPENSSL_NO_STDIO int CRYPTO_mem_leaks_fp(FILE *); @@ -518,8 +472,12 @@ int CRYPTO_mem_leaks(struct bio_st *bio); # endif /* die if we have to */ -void OpenSSLDie(const char *file, int line, const char *assertion); -# define OPENSSL_assert(e) (void)((e) ? 0 : (OpenSSLDie(__FILE__, __LINE__, #e),1)) +# if OPENSSL_API_COMPAT < 0x10100000L +# define OpenSSLDie(f,l,a) OPENSSL_die((a),(f),(l)) +# endif +void OPENSSL_die(const char *assertion, const char *file, int line); +# define OPENSSL_assert(e) \ + (void)((e) ? 0 : (OPENSSL_die("assertion failed: " #e, OPENSSL_FILE, OPENSSL_LINE), 1)) unsigned int *OPENSSL_ia32cap_loc(void); # define OPENSSL_ia32cap ((OPENSSL_ia32cap_loc())[0]) @@ -547,23 +505,25 @@ int CRYPTO_memcmp(const volatile void * volatile in_a, size_t len); /* Standard initialisation options */ -# define OPENSSL_INIT_NO_LOAD_CRYPTO_STRINGS 0x000001 -# define OPENSSL_INIT_LOAD_CRYPTO_STRINGS 0x000002 -# define OPENSSL_INIT_ADD_ALL_CIPHERS 0x000004 -# define OPENSSL_INIT_ADD_ALL_DIGESTS 0x000008 -# define OPENSSL_INIT_NO_ADD_ALL_CIPHERS 0x000010 -# define OPENSSL_INIT_NO_ADD_ALL_DIGESTS 0x000020 -# define OPENSSL_INIT_LOAD_CONFIG 0x000040 -# define OPENSSL_INIT_NO_LOAD_CONFIG 0x000080 -# define OPENSSL_INIT_ASYNC 0x000100 -# define OPENSSL_INIT_ENGINE_RDRAND 0x000200 -# define OPENSSL_INIT_ENGINE_DYNAMIC 0x000400 -# define OPENSSL_INIT_ENGINE_OPENSSL 0x000800 -# define OPENSSL_INIT_ENGINE_CRYPTODEV 0x001000 -# define OPENSSL_INIT_ENGINE_CAPI 0x002000 -# define OPENSSL_INIT_ENGINE_PADLOCK 0x004000 -# define OPENSSL_INIT_ENGINE_DASYNC 0x008000 -/* OPENSSL_INIT flag 0x010000 reserved for internal use */ +# define OPENSSL_INIT_NO_LOAD_CRYPTO_STRINGS 0x00000001L +# define OPENSSL_INIT_LOAD_CRYPTO_STRINGS 0x00000002L +# define OPENSSL_INIT_ADD_ALL_CIPHERS 0x00000004L +# define OPENSSL_INIT_ADD_ALL_DIGESTS 0x00000008L +# define OPENSSL_INIT_NO_ADD_ALL_CIPHERS 0x00000010L +# define OPENSSL_INIT_NO_ADD_ALL_DIGESTS 0x00000020L +# define OPENSSL_INIT_LOAD_CONFIG 0x00000040L +# define OPENSSL_INIT_NO_LOAD_CONFIG 0x00000080L +# define OPENSSL_INIT_ASYNC 0x00000100L +# define OPENSSL_INIT_ENGINE_RDRAND 0x00000200L +# define OPENSSL_INIT_ENGINE_DYNAMIC 0x00000400L +# define OPENSSL_INIT_ENGINE_OPENSSL 0x00000800L +# define OPENSSL_INIT_ENGINE_CRYPTODEV 0x00001000L +# define OPENSSL_INIT_ENGINE_CAPI 0x00002000L +# define OPENSSL_INIT_ENGINE_PADLOCK 0x00004000L +# define OPENSSL_INIT_ENGINE_DASYNC 0x00008000L +/* OPENSSL_INIT flag 0x00010000 reserved for internal use */ +# define OPENSSL_INIT_ENGINE_AFALG 0x00020000L +/* OPENSSL_INIT flag range 0xfff00000 reserved for OPENSSL_init_ssl() */ /* Max OPENSSL_INIT flag value is 0x80000000 */ /* openssl and dasync not counted as builtin */ @@ -573,33 +533,19 @@ int CRYPTO_memcmp(const volatile void * volatile in_a, OPENSSL_INIT_ENGINE_PADLOCK) - -/* Optional settings for initialisation */ -# define OPENSSL_INIT_SET_END 0 -# define OPENSSL_INIT_SET_CONF_FILENAME 1 - -typedef struct ossl_init_settings_st { - int name; - union { - int type_int; - long type_long; - int32_t type_int32_t; - uint32_t type_uint32_t; - int64_t type_int64_t; - uint64_t type_uint64_t; - size_t type_size_t; - const char *type_string; - void *type_void_ptr; - } value; -} OPENSSL_INIT_SETTINGS; - -typedef struct ossl_init_stop_st OPENSSL_INIT_STOP; - /* Library initialisation functions */ -void OPENSSL_INIT_library_stop(void); -void OPENSSL_INIT_crypto_library_start(uint64_t opts, - const OPENSSL_INIT_SETTINGS *settings); -int OPENSSL_INIT_register_stop_handler(void (*handler)(void)); +void OPENSSL_cleanup(void); +int OPENSSL_init_crypto(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings); +int OPENSSL_atexit(void (*handler)(void)); +void OPENSSL_thread_stop(void); + +/* Low-level control of initialization */ +OPENSSL_INIT_SETTINGS *OPENSSL_INIT_new(void); +#ifndef OPENSSL_NO_STDIO +void OPENSSL_INIT_set_config_filename(OPENSSL_INIT_SETTINGS *settings, + const char *config_file); +#endif +void OPENSSL_INIT_free(OPENSSL_INIT_SETTINGS *settings); /* BEGIN ERROR CODES */ /* @@ -626,6 +572,7 @@ void ERR_load_CRYPTO_strings(void); # define CRYPTO_F_INT_DUP_EX_DATA 106 # define CRYPTO_F_INT_FREE_EX_DATA 107 # define CRYPTO_F_INT_NEW_EX_DATA 108 +# define CRYPTO_F_OPENSSL_INIT_CRYPTO 116 # define CRYPTO_F_OPENSSL_MEMDUP 114 /* Reason codes. */