about summary refs log tree commit diff stats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/common.c16
-rw-r--r--src/common.h2
-rw-r--r--src/xmpp/stanza.c19
-rw-r--r--tests/unittests/test_common.c56
-rw-r--r--tests/unittests/test_common.h8
-rw-r--r--tests/unittests/unittests.c7
6 files changed, 18 insertions, 90 deletions
diff --git a/src/common.c b/src/common.c
index a4120e9b..27482d80 100644
--- a/src/common.c
+++ b/src/common.c
@@ -55,7 +55,6 @@
 
 #include "log.h"
 #include "common.h"
-#include <strophe.h>
 
 struct curl_data_t
 {
@@ -330,21 +329,6 @@ release_is_new(char *found_version)
     }
 }
 
-char*
-p_sha1_hash(char *str)
-{
-   unsigned char *digest = (unsigned char*)malloc(XMPP_SHA1_DIGEST_SIZE);
-   assert(digest != NULL);
-
-   xmpp_sha1_digest((unsigned char*)str, strlen(str), digest);
-
-   char *b64 = g_base64_encode(digest, XMPP_SHA1_DIGEST_SIZE);
-   assert(b64 != NULL);
-   free(digest);
-
-   return b64;
-}
-
 static size_t
 _data_callback(void *ptr, size_t size, size_t nmemb, void *data)
 {
diff --git a/src/common.h b/src/common.h
index b2c36c3f..328f7f5a 100644
--- a/src/common.h
+++ b/src/common.h
@@ -92,8 +92,6 @@ char* file_getline(FILE *stream);
 char* release_get_latest(void);
 gboolean release_is_new(char *found_version);
 
-char* p_sha1_hash(char *str);
-
 char* get_file_or_linked(char *loc, char *basedir);
 char* strip_arg_quotes(const char *const input);
 gboolean is_notify_enabled(void);
diff --git a/src/xmpp/stanza.c b/src/xmpp/stanza.c
index 82189ddd..ed13b976 100644
--- a/src/xmpp/stanza.c
+++ b/src/xmpp/stanza.c
@@ -45,6 +45,7 @@
 #include <stdio.h>
 #include <libgen.h>
 #include <inttypes.h>
+#include <assert.h>
 
 #include <glib.h>
 
@@ -66,6 +67,7 @@
 #include "xmpp/muc.h"
 
 static void _stanza_add_unique_id(xmpp_stanza_t *stanza, char *prefix);
+static char* _stanza_create_sha1_hash(char *str);
 
 #if 0
 xmpp_stanza_t*
@@ -1143,7 +1145,7 @@ stanza_create_caps_sha1_from_query(xmpp_stanza_t *const query)
         curr = g_slist_next(curr);
     }
 
-    char *result = p_sha1_hash(s->str);
+    char *result = _stanza_create_sha1_hash(s->str);
 
     g_string_free(s, TRUE);
     g_slist_free_full(identities, g_free);
@@ -2045,3 +2047,18 @@ _stanza_add_unique_id(xmpp_stanza_t *stanza, char *prefix)
     xmpp_stanza_set_id(stanza, id);
     free(id);
 }
+
+static char*
+_stanza_create_sha1_hash(char *str)
+{
+   unsigned char *digest = (unsigned char*)malloc(XMPP_SHA1_DIGEST_SIZE);
+   assert(digest != NULL);
+
+   xmpp_sha1_digest((unsigned char*)str, strlen(str), digest);
+
+   char *b64 = g_base64_encode(digest, XMPP_SHA1_DIGEST_SIZE);
+   assert(b64 != NULL);
+   free(digest);
+
+   return b64;
+}
diff --git a/tests/unittests/test_common.c b/tests/unittests/test_common.c
index 75eed6e2..4849a4a7 100644
--- a/tests/unittests/test_common.c
+++ b/tests/unittests/test_common.c
@@ -212,62 +212,6 @@ void test_blah_is_not_valid_resource_presence_string(void **state)
     assert_false(valid_resource_presence_string("blah"));
 }
 
-void test_p_sha1_hash1(void **state)
-{
-    char *inp = "<message>some message</message>\n<element>another element</element>\n";
-    char *result = p_sha1_hash(inp);
-
-    assert_string_equal(result, "ZJLLzkYc51Lug3fZ7MJJzK95Ikg=");
-}
-
-void test_p_sha1_hash2(void **state)
-{
-    char *inp = "";
-    char *result = p_sha1_hash(inp);
-
-    assert_string_equal(result, "2jmj7l5rSw0yVb/vlWAYkK/YBwk=");
-}
-
-void test_p_sha1_hash3(void **state)
-{
-    char *inp = "m";
-    char *result = p_sha1_hash(inp);
-
-    assert_string_equal(result, "aw0xwNVjIjAk2kVpFYRkOseMlug=");
-}
-
-void test_p_sha1_hash4(void **state)
-{
-    char *inp = "<element/>\n";
-    char *result = p_sha1_hash(inp);
-
-    assert_string_equal(result, "xcgld4ZfXvU0P7+cW3WFLUuE3C8=");
-}
-
-void test_p_sha1_hash5(void **state)
-{
-    char *inp = "  ";
-    char *result = p_sha1_hash(inp);
-
-    assert_string_equal(result, "CZYAoQqUQRSqxAbRNrYl+0Ft13k=");
-}
-
-void test_p_sha1_hash6(void **state)
-{
-    char *inp = " sdf  \n ";
-    char *result = p_sha1_hash(inp);
-
-    assert_string_equal(result, "zjtm8dKlTj1KhYDlM2z8FsmAhSQ=");
-}
-
-void test_p_sha1_hash7(void **state)
-{
-    char *inp = "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer nec odio. Praesent libero. Sed cursus ante dapibus diam. Sed nisi. Nulla quis sem at nibh elementum imperdiet. Duis sagittis ipsum. Praesent mauris. Fusce nec tellus sed augue semper porta. Mauris massa. Vestibulum lacinia arcu eget nulla. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Curabitur sodales ligula in libero. Sed dignissim lacinia nunc. Curabitur tortor. Pellentesque nibh. Aenean quam. In scelerisque sem at dolor. Maecenas mattis. Sed convallis tristique sem. Proin ut ligula vel nunc egestas porttitor. Morbi lectus risus, iaculis vel, suscipit quis, luctus non, massa. Fusce ac turpis quis ligula lacinia aliquet. Mauris ipsum. Nulla metus metus, ullamcorper vel, tincidunt sed, euismod in, nibh. Quisque volutpat condimentum velit. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Nam nec ante. Sed lacinia, urna non tincidunt mattis, tortor neque adipiscing diam, a cursus ipsum ante quis turpis. Nulla facilisi. Ut fringilla. Suspendisse potenti. Nunc feugiat mi a tellus consequat imperdiet. Vestibulum sapien. Proin quam. Etiam ultrices. Suspendisse in justo eu magna luctus suscipit. Sed lectus. Integer euismod lacus luctus magna. Quisque cursus, metus vitae pharetra auctor, sem massa mattis sem, at interdum magna augue eget diam. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Morbi lacinia molestie dui. Praesent blandit dolor. Sed non quam. In vel mi sit amet augue congue elementum. Morbi in ipsum sit amet pede facilisis laoreet. Donec lacus nunc, viverra nec, blandit vel, egestas et, augue. Vestibulum tincidunt malesuada tellus. Ut ultrices ultrices enim. Curabitur sit amet mauris. Morbi in dui quis est pulvinar ullamcorper. Nulla facilisi. Integer lacinia sollicitudin massa. Cras metus. Sed aliquet risus a tortor. Integer id quam. Morbi mi. Quisque nisl felis, venenatis tristique, dignissim in, ultrices sit amet, augue. Proin sodales libero eget ante. Nulla quam. Aenean laoreet. Vestibulum nisi lectus, commodo ac, facilisis ac, ultricies eu, pede. Ut orci risus, accumsan porttitor, cursus quis, aliquet eget, justo. Sed pretium blandit orci. Ut eu diam at pede suscipit sodales. Aenean lectus elit, fermentum non, convallis id, sagittis at, neque. Nullam mauris orci, aliquet et, iaculis et, viverra vitae, ligula. Nulla ut felis in purus aliquam imperdiet. Maecenas aliquet mollis lectus. Vivamus consectetuer risus et tortor. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer nec odio. Praesent libero. Sed cursus ante dapibus diam. Sed nisi. Nulla quis sem at nibh elementum imperdiet. Duis sagittis ipsum. Praesent mauris. Fusce nec tellus sed augue semper porta. Mauris massa. Vestibulum lacinia arcu eget nulla. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Curabitur sodales ligula in libero. Sed dignissim lacinia nunc. Curabitur tortor. Pellentesque nibh. Aenean quam. In scelerisque sem at dolor. Maecenas mattis. Sed convallis tristique sem. Proin ut ligula vel nunc egestas porttitor. Morbi lectus risus, iaculis vel, suscipit quis, luctus non, massa. Fusce ac turpis quis ligula lacinia aliquet. Mauris ipsum. Nulla metus metus, ullamcorper vel, tincidunt sed, euismod in, nibh. Quisque volutpat condimentum velit. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Nam nec ante. Sed lacinia, urna non tincidunt mattis, tortor neque adipiscing diam, a cursus ipsum ante quis turpis. Nulla facilisi. Ut fringilla. Suspendisse potenti. Nunc feugiat mi a tellus consequat imperdiet. Vestibulum sapien. Proin quam. Etiam ultrices. Suspendisse in justo eu magna luctus suscipit. Sed lectus. Integer euismod lacus luctus magna. Quisque cursus, metus vitae pharetra auctor, sem massa mattis sem, at interdum magna augue eget diam. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Morbi lacinia molestie dui. Praesent blandit dolor. Sed non quam. In vel mi sit amet augue congue elementum. Morbi in ipsum sit amet pede facilisis laoreet. Donec lacus nunc, viverra nec, blandit vel, egestas et, augue. Vestibulum tincidunt malesuada tellus. Ut ultrices ultrices enim. Curabitur sit amet mauris. Morbi in dui quis est pulvinar ullamcorper. Nulla facilisi. Integer lacinia sollicitudin massa. Cras metus. Sed aliquet risus a tortor. Integer id quam. Morbi mi. Quisque nisl felis, venenatis tristique, dignissim in, ultrices sit amet, augue. Proin sodales libero eget ante. Nulla quam. Aenean laoreet. Vestibulum nisi lectus, commodo ac, facilisis ac, ultricies eu, pede. Ut orci risus, accumsan porttitor, cursus quis, aliquet eget, justo. Sed pretium blandit orci. Ut eu diam at pede suscipit sodales. Aenean lectus elit, fermentum non, convallis id, sagittis at, neque. Nullam mauris orci, aliquet et, iaculis et, viverra vitae, ligula. Nulla ut felis in purus aliquam imperdiet. Maecenas aliquet mollis lectus. Vivamus consectetuer risus et tortor. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer nec odio. Praesent libero. Sed cursus ante dapibus diam. Sed nisi. Nulla quis sem at nibh elementum imperdiet. Duis sagittis ipsum. Praesent mauris. Fusce nec tellus sed augue semper porta. Mauris massa. Vestibulum lacinia arcu eget nulla. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Curabitur sodales ligula in libero. Sed dignissim lacinia nunc. Curabitur tortor. Pellentesque nibh. Aenean quam. In scelerisque sem at dolor. Maecenas mattis. Sed convallis tristique sem. Proin ut ligula vel nunc egestas porttitor. Morbi lectus risus, iaculis vel, suscipit quis, luctus non, massa. Fusce ac turpis quis ligula lacinia aliquet. Mauris ipsum. Nulla metus metus, ullamcorper vel, tincidunt sed, euismod in, nibh. Quisque volutpat condimentum velit. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Nam nec ante. Sed lacinia, urna non tincidunt mattis, tortor neque adipiscing diam, a cursus ipsum ante quis turpis. Nulla facilisi. Ut fringilla. Suspendisse potenti. Nunc feugiat mi a tellus consequat imperdiet. Vestibulum sapien. Proin quam. Etiam ultrices. Suspendisse in justo eu magna luctus suscipit. Sed lectus. Integer euismod lacus luctus magna. Quisque cursus, metus vitae pharetra auctor, sem massa mattis sem, at interdum magna augue eget diam. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Morbi lacinia molestie dui. Praesent blandit dolor. Sed non quam. In vel mi sit amet augue congue elementum. Morbi in ipsum si.";
-    char *result = p_sha1_hash(inp);
-
-    assert_string_equal(result, "bNfKVfqEOGmzlH8M+e8FYTB46SU=");
-}
-
 void utf8_display_len_null_str(void **state)
 {
     int result = utf8_display_len(NULL);
diff --git a/tests/unittests/test_common.h b/tests/unittests/test_common.h
index 6da87a68..bcef3367 100644
--- a/tests/unittests/test_common.h
+++ b/tests/unittests/test_common.h
@@ -19,14 +19,6 @@ void test_dnd_is_valid_resource_presence_string(void **state);
 void test_available_is_not_valid_resource_presence_string(void **state);
 void test_unavailable_is_not_valid_resource_presence_string(void **state);
 void test_blah_is_not_valid_resource_presence_string(void **state);
-void test_p_sha1_hash1(void **state);
-void test_p_sha1_hash2(void **state);
-void test_p_sha1_hash3(void **state);
-void test_p_sha1_hash4(void **state);
-void test_p_sha1_hash5(void **state);
-void test_p_sha1_hash6(void **state);
-void test_p_sha1_hash6(void **state);
-void test_p_sha1_hash7(void **state);
 void utf8_display_len_null_str(void **state);
 void utf8_display_len_1_non_wide(void **state);
 void utf8_display_len_1_wide(void **state);
diff --git a/tests/unittests/unittests.c b/tests/unittests/unittests.c
index 4e3e149e..8fad2e51 100644
--- a/tests/unittests/unittests.c
+++ b/tests/unittests/unittests.c
@@ -78,13 +78,6 @@ int main(int argc, char* argv[]) {
         unit_test(test_available_is_not_valid_resource_presence_string),
         unit_test(test_unavailable_is_not_valid_resource_presence_string),
         unit_test(test_blah_is_not_valid_resource_presence_string),
-        unit_test(test_p_sha1_hash1),
-        unit_test(test_p_sha1_hash2),
-        unit_test(test_p_sha1_hash3),
-        unit_test(test_p_sha1_hash4),
-        unit_test(test_p_sha1_hash5),
-        unit_test(test_p_sha1_hash6),
-        unit_test(test_p_sha1_hash7),
         unit_test(utf8_display_len_null_str),
         unit_test(utf8_display_len_1_non_wide),
         unit_test(utf8_display_len_1_wide),
generated by cgit-pink 1.4.1-2-gfad0 (git 2.36.2.497.gbbea4dcf42) at 2024-07-04 05:33:07 +0000