diff options
Diffstat (limited to '')
| -rw-r--r-- | src/lib/libcrypto/threads/mttest.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/lib/libcrypto/threads/mttest.c b/src/lib/libcrypto/threads/mttest.c index 24713a3157..100165948c 100644 --- a/src/lib/libcrypto/threads/mttest.c +++ b/src/lib/libcrypto/threads/mttest.c | |||
| @@ -699,7 +699,7 @@ void thread_setup(void) | |||
| 699 | { | 699 | { |
| 700 | int i; | 700 | int i; |
| 701 | 701 | ||
| 702 | lock_cs=Malloc(CRYPTO_num_locks() * sizeof(HANDLE)); | 702 | lock_cs=OPENSSL_malloc(CRYPTO_num_locks() * sizeof(HANDLE)); |
| 703 | for (i=0; i<CRYPTO_num_locks(); i++) | 703 | for (i=0; i<CRYPTO_num_locks(); i++) |
| 704 | { | 704 | { |
| 705 | lock_cs[i]=CreateMutex(NULL,FALSE,NULL); | 705 | lock_cs[i]=CreateMutex(NULL,FALSE,NULL); |
| @@ -716,7 +716,7 @@ void thread_cleanup(void) | |||
| 716 | CRYPTO_set_locking_callback(NULL); | 716 | CRYPTO_set_locking_callback(NULL); |
| 717 | for (i=0; i<CRYPTO_num_locks(); i++) | 717 | for (i=0; i<CRYPTO_num_locks(); i++) |
| 718 | CloseHandle(lock_cs[i]); | 718 | CloseHandle(lock_cs[i]); |
| 719 | Free(lock_cs); | 719 | OPENSSL_free(lock_cs); |
| 720 | } | 720 | } |
| 721 | 721 | ||
| 722 | void win32_locking_callback(int mode, int type, char *file, int line) | 722 | void win32_locking_callback(int mode, int type, char *file, int line) |
| @@ -794,8 +794,8 @@ void thread_setup(void) | |||
| 794 | { | 794 | { |
| 795 | int i; | 795 | int i; |
| 796 | 796 | ||
| 797 | lock_cs=Malloc(CRYPTO_num_locks() * sizeof(mutex_t)); | 797 | lock_cs=OPENSSL_malloc(CRYPTO_num_locks() * sizeof(mutex_t)); |
| 798 | lock_count=Malloc(CRYPTO_num_locks() * sizeof(long)); | 798 | lock_count=OPENSSL_malloc(CRYPTO_num_locks() * sizeof(long)); |
| 799 | for (i=0; i<CRYPTO_num_locks(); i++) | 799 | for (i=0; i<CRYPTO_num_locks(); i++) |
| 800 | { | 800 | { |
| 801 | lock_count[i]=0; | 801 | lock_count[i]=0; |
| @@ -821,8 +821,8 @@ void thread_cleanup(void) | |||
| 821 | mutex_destroy(&(lock_cs[i])); | 821 | mutex_destroy(&(lock_cs[i])); |
| 822 | fprintf(stderr,"%8ld:%s\n",lock_count[i],CRYPTO_get_lock_name(i)); | 822 | fprintf(stderr,"%8ld:%s\n",lock_count[i],CRYPTO_get_lock_name(i)); |
| 823 | } | 823 | } |
| 824 | Free(lock_cs); | 824 | OPENSSL_free(lock_cs); |
| 825 | Free(lock_count); | 825 | OPENSSL_free(lock_count); |
| 826 | 826 | ||
| 827 | fprintf(stderr,"done cleanup\n"); | 827 | fprintf(stderr,"done cleanup\n"); |
| 828 | 828 | ||
| @@ -919,7 +919,7 @@ void thread_setup(void) | |||
| 919 | arena=usinit(filename); | 919 | arena=usinit(filename); |
| 920 | unlink(filename); | 920 | unlink(filename); |
| 921 | 921 | ||
| 922 | lock_cs=Malloc(CRYPTO_num_locks() * sizeof(usema_t *)); | 922 | lock_cs=OPENSSL_malloc(CRYPTO_num_locks() * sizeof(usema_t *)); |
| 923 | for (i=0; i<CRYPTO_num_locks(); i++) | 923 | for (i=0; i<CRYPTO_num_locks(); i++) |
| 924 | { | 924 | { |
| 925 | lock_cs[i]=usnewsema(arena,1); | 925 | lock_cs[i]=usnewsema(arena,1); |
| @@ -942,7 +942,7 @@ void thread_cleanup(void) | |||
| 942 | usdumpsema(lock_cs[i],stdout,buf); | 942 | usdumpsema(lock_cs[i],stdout,buf); |
| 943 | usfreesema(lock_cs[i],arena); | 943 | usfreesema(lock_cs[i],arena); |
| 944 | } | 944 | } |
| 945 | Free(lock_cs); | 945 | OPENSSL_free(lock_cs); |
| 946 | } | 946 | } |
| 947 | 947 | ||
| 948 | void irix_locking_callback(int mode, int type, char *file, int line) | 948 | void irix_locking_callback(int mode, int type, char *file, int line) |
| @@ -1002,8 +1002,8 @@ void thread_setup(void) | |||
| 1002 | { | 1002 | { |
| 1003 | int i; | 1003 | int i; |
| 1004 | 1004 | ||
| 1005 | lock_cs=Malloc(CRYPTO_num_locks() * sizeof(pthread_mutex_t)); | 1005 | lock_cs=OPENSSL_malloc(CRYPTO_num_locks() * sizeof(pthread_mutex_t)); |
| 1006 | lock_count=Malloc(CRYPTO_num_locks() * sizeof(long)); | 1006 | lock_count=OPENSSL_malloc(CRYPTO_num_locks() * sizeof(long)); |
| 1007 | for (i=0; i<CRYPTO_num_locks(); i++) | 1007 | for (i=0; i<CRYPTO_num_locks(); i++) |
| 1008 | { | 1008 | { |
| 1009 | lock_count[i]=0; | 1009 | lock_count[i]=0; |
| @@ -1026,8 +1026,8 @@ void thread_cleanup(void) | |||
| 1026 | fprintf(stderr,"%8ld:%s\n",lock_count[i], | 1026 | fprintf(stderr,"%8ld:%s\n",lock_count[i], |
| 1027 | CRYPTO_get_lock_name(i)); | 1027 | CRYPTO_get_lock_name(i)); |
| 1028 | } | 1028 | } |
| 1029 | Free(lock_cs); | 1029 | OPENSSL_free(lock_cs); |
| 1030 | Free(lock_count); | 1030 | OPENSSL_free(lock_count); |
| 1031 | 1031 | ||
| 1032 | fprintf(stderr,"done cleanup\n"); | 1032 | fprintf(stderr,"done cleanup\n"); |
| 1033 | } | 1033 | } |