diff options
Diffstat (limited to '')
| -rw-r--r-- | src/lib/libcrypto/threads/th-lock.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/lib/libcrypto/threads/th-lock.c b/src/lib/libcrypto/threads/th-lock.c index 3ee978060c..553d2218de 100644 --- a/src/lib/libcrypto/threads/th-lock.c +++ b/src/lib/libcrypto/threads/th-lock.c | |||
| @@ -113,7 +113,7 @@ void CRYPTO_thread_setup(void) | |||
| 113 | { | 113 | { |
| 114 | int i; | 114 | int i; |
| 115 | 115 | ||
| 116 | lock_cs=Malloc(CRYPTO_num_locks() * sizeof(HANDLE)); | 116 | lock_cs=OPENSSL_malloc(CRYPTO_num_locks() * sizeof(HANDLE)); |
| 117 | for (i=0; i<CRYPTO_num_locks(); i++) | 117 | for (i=0; i<CRYPTO_num_locks(); i++) |
| 118 | { | 118 | { |
| 119 | lock_cs[i]=CreateMutex(NULL,FALSE,NULL); | 119 | lock_cs[i]=CreateMutex(NULL,FALSE,NULL); |
| @@ -131,7 +131,7 @@ static void CRYPTO_thread_cleanup(void) | |||
| 131 | CRYPTO_set_locking_callback(NULL); | 131 | CRYPTO_set_locking_callback(NULL); |
| 132 | for (i=0; i<CRYPTO_num_locks(); i++) | 132 | for (i=0; i<CRYPTO_num_locks(); i++) |
| 133 | CloseHandle(lock_cs[i]); | 133 | CloseHandle(lock_cs[i]); |
| 134 | Free(lock_cs); | 134 | OPENSSL_free(lock_cs); |
| 135 | } | 135 | } |
| 136 | 136 | ||
| 137 | void win32_locking_callback(int mode, int type, char *file, int line) | 137 | void win32_locking_callback(int mode, int type, char *file, int line) |
| @@ -164,11 +164,11 @@ void CRYPTO_thread_setup(void) | |||
| 164 | int i; | 164 | int i; |
| 165 | 165 | ||
| 166 | #ifdef USE_MUTEX | 166 | #ifdef USE_MUTEX |
| 167 | lock_cs=Malloc(CRYPTO_num_locks() * sizeof(mutex_t)); | 167 | lock_cs=OPENSSL_malloc(CRYPTO_num_locks() * sizeof(mutex_t)); |
| 168 | #else | 168 | #else |
| 169 | lock_cs=Malloc(CRYPTO_num_locks() * sizeof(rwlock_t)); | 169 | lock_cs=OPENSSL_malloc(CRYPTO_num_locks() * sizeof(rwlock_t)); |
| 170 | #endif | 170 | #endif |
| 171 | lock_count=Malloc(CRYPTO_num_locks() * sizeof(long)); | 171 | lock_count=OPENSSL_malloc(CRYPTO_num_locks() * sizeof(long)); |
| 172 | for (i=0; i<CRYPTO_num_locks(); i++) | 172 | for (i=0; i<CRYPTO_num_locks(); i++) |
| 173 | { | 173 | { |
| 174 | lock_count[i]=0; | 174 | lock_count[i]=0; |
| @@ -196,8 +196,8 @@ void CRYPTO_thread_cleanup(void) | |||
| 196 | rwlock_destroy(&(lock_cs[i])); | 196 | rwlock_destroy(&(lock_cs[i])); |
| 197 | #endif | 197 | #endif |
| 198 | } | 198 | } |
| 199 | Free(lock_cs); | 199 | OPENSSL_free(lock_cs); |
| 200 | Free(lock_count); | 200 | OPENSSL_free(lock_count); |
| 201 | } | 201 | } |
| 202 | 202 | ||
| 203 | void solaris_locking_callback(int mode, int type, char *file, int line) | 203 | void solaris_locking_callback(int mode, int type, char *file, int line) |
| @@ -267,7 +267,7 @@ void CRYPTO_thread_setup(void) | |||
| 267 | arena=usinit(filename); | 267 | arena=usinit(filename); |
| 268 | unlink(filename); | 268 | unlink(filename); |
| 269 | 269 | ||
| 270 | lock_cs=Malloc(CRYPTO_num_locks() * sizeof(usema_t *)); | 270 | lock_cs=OPENSSL_malloc(CRYPTO_num_locks() * sizeof(usema_t *)); |
| 271 | for (i=0; i<CRYPTO_num_locks(); i++) | 271 | for (i=0; i<CRYPTO_num_locks(); i++) |
| 272 | { | 272 | { |
| 273 | lock_cs[i]=usnewsema(arena,1); | 273 | lock_cs[i]=usnewsema(arena,1); |
| @@ -290,7 +290,7 @@ void CRYPTO_thread_cleanup(void) | |||
| 290 | usdumpsema(lock_cs[i],stdout,buf); | 290 | usdumpsema(lock_cs[i],stdout,buf); |
| 291 | usfreesema(lock_cs[i],arena); | 291 | usfreesema(lock_cs[i],arena); |
| 292 | } | 292 | } |
| 293 | Free(lock_cs); | 293 | OPENSSL_free(lock_cs); |
| 294 | } | 294 | } |
| 295 | 295 | ||
| 296 | void irix_locking_callback(int mode, int type, char *file, int line) | 296 | void irix_locking_callback(int mode, int type, char *file, int line) |
| @@ -324,8 +324,8 @@ void CRYPTO_thread_setup(void) | |||
| 324 | { | 324 | { |
| 325 | int i; | 325 | int i; |
| 326 | 326 | ||
| 327 | lock_cs=Malloc(CRYPTO_num_locks() * sizeof(pthread_mutex_t)); | 327 | lock_cs=OPENSSL_malloc(CRYPTO_num_locks() * sizeof(pthread_mutex_t)); |
| 328 | lock_count=Malloc(CRYPTO_num_locks() * sizeof(long)); | 328 | lock_count=OPENSSL_malloc(CRYPTO_num_locks() * sizeof(long)); |
| 329 | for (i=0; i<CRYPTO_num_locks(); i++) | 329 | for (i=0; i<CRYPTO_num_locks(); i++) |
| 330 | { | 330 | { |
| 331 | lock_count[i]=0; | 331 | lock_count[i]=0; |
| @@ -345,8 +345,8 @@ void thread_cleanup(void) | |||
| 345 | { | 345 | { |
| 346 | pthread_mutex_destroy(&(lock_cs[i])); | 346 | pthread_mutex_destroy(&(lock_cs[i])); |
| 347 | } | 347 | } |
| 348 | Free(lock_cs); | 348 | OPENSSL_free(lock_cs); |
| 349 | Free(lock_count); | 349 | OPENSSL_free(lock_count); |
| 350 | } | 350 | } |
| 351 | 351 | ||
| 352 | void pthreads_locking_callback(int mode, int type, char *file, | 352 | void pthreads_locking_callback(int mode, int type, char *file, |