Keep original OpenSSL memory allocation routines

no-tn-check

Need to avoid crash process linked with libgmem.
Crash is happening when OPENSSL_cleanup is freeing memory, but gmem.out file
descriptor already closed.
Add -t parameter for memory leak tests to be more strict.

Author: anisimkov

config/ssl/aws-net-ssl__openssl.adb

@@ -1575,6 +1575,8 @@ package body AWS.Net.SSL is
       end if;
    end Socket_Write;
 
+   Keep_M, Keep_R, Keep_F : System.Address;
+
    -------------
    -- Locking --
    -------------
@@ -1709,6 +1711,12 @@ package body AWS.Net.SSL is
             end if;
          end loop;
 
+         if Keep_M /= System.Null_Address
+           and then TSSL.CRYPTO_set_mem_functions (Keep_M, Keep_R, Keep_F) = 0
+         then
+            Keep_M := System.Null_Address;
+         end if;
+
          Finalized := True;
       end Finalize;
 
@@ -2368,6 +2376,8 @@ package body AWS.Net.SSL is
    end Version;
 
 begin
+   TSSL.CRYPTO_get_mem_functions (M => Keep_M, R => Keep_R, F => Keep_F);
+
    --  Set the RTL memory allocation routines is necessary only to be able
    --  gnatmem control memory leak allocated inside of OpenSSL library.
 
@@ -2380,7 +2390,8 @@ begin
       --  we are unable to setup our own memory allocation routines. GNATMEM
       --  would not be aware of memory allocations inside of OpenSSL in this
       --  case, but AWS is able to run anyway.
-      null;
+
+      Keep_M := System.Null_Address; -- To do not restore back
    end if;
 
    Locking.Initialize;

config/ssl/ssl-thin__openssl.ads

@@ -839,6 +839,9 @@ package SSL.Thin is
    -- Library initialization routines --
    -------------------------------------
 
+   procedure CRYPTO_get_mem_functions (M, R, F : out System.Address)
+     with Import, Convention => C, External_Name => "CRYPTO_get_mem_functions";
+
    function CRYPTO_set_mem_functions (M, R, F : System.Address) return int
      with Import, Convention => C, External_Name => "CRYPTO_set_mem_functions";
 

regtests/0043_check_mem/test.py

@@ -5,12 +5,12 @@
 
 #  Run driver (2 loops)
 run('check_mem', ['2'])
-exec_cmd('gnatmem', ['5', '-i', 'gmem.out', './check_mem'],
+exec_cmd('gnatmem', ['5', '-t', '-i', 'gmem.out', './check_mem'],
          output_file='check_mem.run1')
 
 #  Run driver (10 loops)
 run('check_mem', ['10'])
-exec_cmd('gnatmem', ['5', '-i', 'gmem.out', './check_mem'],
+exec_cmd('gnatmem', ['5', '-t', '-i', 'gmem.out', './check_mem'],
          output_file='check_mem.run2')
 
 #  Now check that final water-mark for run1 and run2 is equal

regtests/0213_check_mem_nossl/test.py

@@ -26,12 +26,12 @@
 
 #  Run driver (2 loops)
 run('check_mem_nossl', ['2'])
-exec_cmd('gnatmem', ['5', '-i', 'gmem.out', './check_mem_nossl'],
+exec_cmd('gnatmem', ['5', '-t', '-i', 'gmem.out', './check_mem_nossl'],
          output_file='check_mem_nossl.run1')
 
 #  Run driver (10 loops)
 run('check_mem_nossl', ['10'])
-exec_cmd('gnatmem', ['5', '-i', 'gmem.out', './check_mem_nossl'],
+exec_cmd('gnatmem', ['5', '-t', '-i', 'gmem.out', './check_mem_nossl'],
          output_file='check_mem_nossl.run2')
 
 #  Now check that final water-mark for run1 and run2 is equal