X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=crypto%2Fmem_sec.c;h=0c24ed819bb86b0244fb98912b2f5eddaeadecf9;hb=fdd9236747d7b843f1f5644b3e95580b80d9a598;hp=703ddad5e596b15684f439f16453d8a5c81145ad;hpb=bef7a81530442033ecb727196bddeb96d327acaf;p=oweals%2Fopenssl.git

diff --git a/crypto/mem_sec.c b/crypto/mem_sec.c
index 703ddad5e5..0c24ed819b 100644
--- a/crypto/mem_sec.c
+++ b/crypto/mem_sec.c
@@ -15,8 +15,8 @@
  * For details on that implementation, see below (look for uppercase
  * "SECURE HEAP IMPLEMENTATION").
  */
-#include <openssl/crypto.h>
 #include "e_os.h"
+#include <openssl/crypto.h>
 
 #include <string.h>
 
@@ -66,7 +66,7 @@ int CRYPTO_secure_malloc_init(size_t size, int minsize)
     int ret = 0;
 
     if (!secure_mem_initialized) {
-        sec_malloc_lock = CRYPTO_THREAD_lock_new();
+        sec_malloc_lock = CRYPTO_THREAD_glock_new("sec_malloc");
         if (sec_malloc_lock == NULL)
             return 0;
         if ((ret = sh_init(size, minsize)) != 0) {
@@ -374,7 +374,7 @@ static int sh_init(size_t size, int minsize)
     size_t pgsize;
     size_t aligned;
 
-    memset(&sh, 0, sizeof sh);
+    memset(&sh, 0, sizeof(sh));
 
     /* make sure size and minsize are powers of 2 */
     OPENSSL_assert(size > 0);
@@ -401,7 +401,7 @@ static int sh_init(size_t size, int minsize)
     for (i = sh.bittable_size; i; i >>= 1)
         sh.freelist_size++;
 
-    sh.freelist = OPENSSL_zalloc(sh.freelist_size * sizeof (char *));
+    sh.freelist = OPENSSL_zalloc(sh.freelist_size * sizeof(char *));
     OPENSSL_assert(sh.freelist != NULL);
     if (sh.freelist == NULL)
         goto err;
@@ -498,7 +498,7 @@ static void sh_done()
     OPENSSL_free(sh.bitmalloc);
     if (sh.map_result != NULL && sh.map_size)
         munmap(sh.map_result, sh.map_size);
-    memset(&sh, 0, sizeof sh);
+    memset(&sh, 0, sizeof(sh));
 }
 
 static int sh_allocated(const char *ptr)