From ca7da823c37e9071348944387c49782c242bf357 Mon Sep 17 00:00:00 2001
From: Anderson Toshiyuki Sasaki <ansasaki@redhat.com>
Date: Mon, 24 Sep 2018 18:56:22 +0200
Subject: [PATCH] tests: Replace ssh_string_free() with SSH_STRING_FREE()

Signed-off-by: Anderson Toshiyuki Sasaki <ansasaki@redhat.com>
Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
---
 tests/unittests/torture_buffer.c         | 4 ++--
 tests/unittests/torture_keyfiles.c       | 6 +++---
 tests/unittests/torture_pki_ed25519.c    | 6 +++---
 tests/unittests/torture_threads_buffer.c | 4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/tests/unittests/torture_buffer.c b/tests/unittests/torture_buffer.c
index 4d29a2a5..6d504c19 100644
--- a/tests/unittests/torture_buffer.c
+++ b/tests/unittests/torture_buffer.c
@@ -125,7 +125,7 @@ static void torture_ssh_buffer_get_ssh_string(void **state) {
         for(l=0;l<k;++l){
           ssh_string str = ssh_buffer_get_ssh_string(buffer);
           assert_null(str);
-          ssh_string_free(str);
+          SSH_STRING_FREE(str);
         }
         ssh_buffer_free(buffer);
       }
@@ -161,7 +161,7 @@ static void torture_ssh_buffer_add_format(void **state) {
     assert_int_equal(len, sizeof(verif) - 1);
     assert_memory_equal(ssh_buffer_get(buffer), verif, sizeof(verif) -1);
 
-    ssh_string_free(s);
+    SSH_STRING_FREE(s);
 }
 
 static void torture_ssh_buffer_get_format(void **state) {
diff --git a/tests/unittests/torture_keyfiles.c b/tests/unittests/torture_keyfiles.c
index de924f00..55af6c7b 100644
--- a/tests/unittests/torture_keyfiles.c
+++ b/tests/unittests/torture_keyfiles.c
@@ -111,7 +111,7 @@ static void torture_pubkey_from_file(void **state) {
 
     assert_true(rc == 0);
 
-    ssh_string_free(pubkey);
+    SSH_STRING_FREE(pubkey);
 
     /* test if it returns 1 if pubkey doesn't exist */
     unlink(LIBSSH_RSA_TESTKEY ".pub");
@@ -210,8 +210,8 @@ static void torture_pubkey_generate_from_privkey(void **state) {
 
     assert_string_equal(pubkey_line_orig, pubkey_line_new);
 
-    ssh_string_free(pubkey_orig);
-    ssh_string_free(pubkey_new);
+    SSH_STRING_FREE(pubkey_orig);
+    SSH_STRING_FREE(pubkey_new);
 }
 
 /**
diff --git a/tests/unittests/torture_pki_ed25519.c b/tests/unittests/torture_pki_ed25519.c
index 16bd91f3..a4b147bf 100644
--- a/tests/unittests/torture_pki_ed25519.c
+++ b/tests/unittests/torture_pki_ed25519.c
@@ -441,7 +441,7 @@ static void torture_pki_ed25519_sign(void **state)
     /* ssh_print_hexa("signature", ssh_string_data(blob), ssh_string_len(blob)); */
     ssh_signature_free(sig);
     SSH_KEY_FREE(privkey);
-    ssh_string_free(blob);
+    SSH_STRING_FREE(blob);
 
 }
 
@@ -473,7 +473,7 @@ static void torture_pki_ed25519_verify(void **state){
     /* alter signature and expect false result */
 
     SSH_KEY_FREE(pubkey);
-    ssh_string_free(blob);
+    SSH_STRING_FREE(blob);
     free(pkey_ptr);
 }
 
@@ -509,7 +509,7 @@ static void torture_pki_ed25519_verify_bad(void **state){
 
     }
     SSH_KEY_FREE(pubkey);
-    ssh_string_free(blob);
+    SSH_STRING_FREE(blob);
     free(pkey_ptr);
 }
 
diff --git a/tests/unittests/torture_threads_buffer.c b/tests/unittests/torture_threads_buffer.c
index e3cebdc9..0bdcfd29 100644
--- a/tests/unittests/torture_threads_buffer.c
+++ b/tests/unittests/torture_threads_buffer.c
@@ -247,7 +247,7 @@ static void *thread_ssh_buffer_get_ssh_string(void *threadid)
                 for (l = 0; l < k; ++l) {
                     ssh_string str = ssh_buffer_get_ssh_string(buffer);
                     assert_null(str);
-                    ssh_string_free(str);
+                    SSH_STRING_FREE(str);
                 }
                 ssh_buffer_free(buffer);
             }
@@ -316,7 +316,7 @@ static void *thread_ssh_buffer_add_format(void *threadid)
     assert_int_equal(len, sizeof(verif) - 1);
     assert_memory_equal(ssh_buffer_get(buffer), verif, sizeof(verif) -1);
 
-    ssh_string_free(s);
+    SSH_STRING_FREE(s);
 
     /* Teardown */
     ssh_buffer_free(buffer);