Changed to use gnutls instead of openssl for sha1 hashing

8 files changed, 98 insertions, 17 deletions

diff --git a/configure.ac b/configure.ac
index 13f7699e..8be3bd3d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -122,6 +122,9 @@ PKG_CHECK_MODULES([glib], [glib-2.0 >= 2.26], [],
     [AC_MSG_ERROR([glib 2.26 or higher is required for profanity])])
 PKG_CHECK_MODULES([curl], [libcurl], [],
     [AC_MSG_ERROR([libcurl is required for profanity])])
+PKG_CHECK_MODULES([gnutls], [gnutls >= 3.0.0], [],
+    [AC_MSG_ERROR([gnutls is required for profanity])])
+
 AS_IF([test "x$PLATFORM" = xosx], [LIBS="$LIBS -lcurl"])
 
 ### Check for desktop notification support
@@ -216,9 +219,9 @@ AC_CHECK_HEADERS([ncurses.h], [], [])
 AM_CFLAGS="-Wall -Wno-deprecated-declarations"
 AS_IF([test "x$PACKAGE_STATUS" = xdevelopment],
     [AM_CFLAGS="$AM_CFLAGS -Wunused -Werror"])
-AM_CPPFLAGS="$AM_CPPFLAGS $glib_CFLAGS $curl_CFLAGS $libnotify_CFLAGS"
+AM_CPPFLAGS="$AM_CPPFLAGS $glib_CFLAGS $curl_CFLAGS $libnotify_CFLAGS $gnutls_CFLAGS"
 AM_CPPFLAGS="$AM_CPPFLAGS -DTHEMES_PATH=\"\\\"$THEMES_PATH\\\"\""
-LIBS="$LIBS $glib_LIBS $curl_LIBS $libnotify_LIBS"
+LIBS="$LIBS $glib_LIBS $curl_LIBS $libnotify_LIBS $gnutls_LIBS"
 
 AC_SUBST(AM_CFLAGS)
 AC_SUBST(AM_CPPFLAGS)
diff --git a/src/common.c b/src/common.c
index 314e5440..260dec1a 100644
--- a/src/common.c
+++ b/src/common.c
@@ -31,6 +31,8 @@
 #include <curl/curl.h>
 #include <curl/easy.h>
 #include <glib.h>
+#include <gnutls/gnutls.h>
+#include <gnutls/crypto.h>
 
 #include "log.h"
 #include "common.h"
@@ -388,6 +390,21 @@ generate_unique_id(char *prefix)
     return result;
 }
 
+char *
+sha1_hash(char *str)
+{
+    gnutls_hash_hd_t dig;
+    gnutls_digest_algorithm_t algorithm = GNUTLS_DIG_SHA1;
+
+    gnutls_hash_init(&dig, algorithm);
+    gnutls_hash(dig, str, strlen(str));
+
+    unsigned char output[20];
+    gnutls_hash_output(dig, output);
+
+    return g_base64_encode(output, sizeof(output));
+}
+
 int
 cmp_win_num(gconstpointer a, gconstpointer b)
 {
diff --git a/src/common.h b/src/common.h
index 1fefad06..e6b0b267 100644
--- a/src/common.h
+++ b/src/common.h
@@ -88,6 +88,7 @@ const char * string_from_resource_presence(resource_presence_t presence);
 resource_presence_t resource_presence_from_string(const char * const str);
 contact_presence_t contact_presence_from_resource_presence(resource_presence_t resource_presence);
 
+char * sha1_hash(char *str);
 char * generate_unique_id(char *prefix);
 
 int cmp_win_num(gconstpointer a, gconstpointer b);
diff --git a/src/profanity.c b/src/profanity.c
index 95355670..0fb6ebbd 100644
--- a/src/profanity.c
+++ b/src/profanity.c
@@ -31,6 +31,7 @@
 #include <string.h>
 
 #include <glib.h>
+#include <gnutls/gnutls.h>
 
 #include "profanity.h"
 #include "chat_session.h"
@@ -254,6 +255,7 @@ _init(const int disable_tls, char *log_level)
     setlocale(LC_ALL, "");
     // ignore SIGPIPE
     signal(SIGPIPE, SIG_IGN);
+    gnutls_global_init();
     _create_directories();
     log_level_t prof_log_level = log_level_from_string(log_level);
     prefs_load();
@@ -302,6 +304,7 @@ _shutdown(void)
     accounts_close();
     cmd_uninit();
     log_close();
+    gnutls_global_deinit();
 }
 
 static void
diff --git a/src/xmpp/capabilities.c b/src/xmpp/capabilities.c
index b44095f1..cd2e3fce 100644
--- a/src/xmpp/capabilities.c
+++ b/src/xmpp/capabilities.c
@@ -30,7 +30,6 @@
 #include <string.h>
 
 #include <glib.h>
-#include <openssl/evp.h>
 #include <strophe.h>
 
 #include "common.h"
@@ -203,20 +202,7 @@ caps_create_sha1_str(xmpp_stanza_t * const query)
         curr = g_slist_next(curr);
     }
 
-    EVP_MD_CTX mdctx;
-    const EVP_MD *md;
-
-    unsigned char md_value[EVP_MAX_MD_SIZE];
-    unsigned int md_len;
-    OpenSSL_add_all_digests();
-    md = EVP_get_digestbyname("SHA1");
-    EVP_MD_CTX_init(&mdctx);
-    EVP_DigestInit_ex(&mdctx, md, NULL);
-    EVP_DigestUpdate(&mdctx, s->str, strlen(s->str));
-    EVP_DigestFinal_ex(&mdctx, md_value, &md_len);
-    EVP_MD_CTX_cleanup(&mdctx);
-
-    char *result = g_base64_encode(md_value, md_len);
+    char *result = sha1_hash(s->str);
 
     g_string_free(s, TRUE);
     g_slist_free_full(identities, g_free);
diff --git a/tests/test_common.c b/tests/test_common.c
index 146cb7d0..60cfdccc 100644
--- a/tests/test_common.c
+++ b/tests/test_common.c
@@ -488,3 +488,59 @@ void test_blah_is_not_valid_resource_presence_string(void **state)
 {
     assert_false(valid_resource_presence_string("blah"));
 }
+
+void test_sha1_hash1(void **state)
+{
+    char *inp = "<message>some message</message>\n<element>another element</element>\n";
+    char *result = sha1_hash(inp);
+
+    assert_string_equal(result, "ZJLLzkYc51Lug3fZ7MJJzK95Ikg=");
+}
+
+void test_sha1_hash2(void **state)
+{
+    char *inp = "";
+    char *result = sha1_hash(inp);
+
+    assert_string_equal(result, "2jmj7l5rSw0yVb/vlWAYkK/YBwk=");
+}
+
+void test_sha1_hash3(void **state)
+{
+    char *inp = "m";
+    char *result = sha1_hash(inp);
+
+    assert_string_equal(result, "aw0xwNVjIjAk2kVpFYRkOseMlug=");
+}
+
+void test_sha1_hash4(void **state)
+{
+    char *inp = "<element/>\n";
+    char *result = sha1_hash(inp);
+
+    assert_string_equal(result, "xcgld4ZfXvU0P7+cW3WFLUuE3C8=");
+}
+
+void test_sha1_hash5(void **state)
+{
+    char *inp = "  ";
+    char *result = sha1_hash(inp);
+
+    assert_string_equal(result, "CZYAoQqUQRSqxAbRNrYl+0Ft13k=");
+}
+
+void test_sha1_hash6(void **state)
+{
+    char *inp = " sdf  \n ";
+    char *result = sha1_hash(inp);
+
+    assert_string_equal(result, "zjtm8dKlTj1KhYDlM2z8FsmAhSQ=");
+}
+
+void test_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 = sha1_hash(inp);
+
+    assert_string_equal(result, "bNfKVfqEOGmzlH8M+e8FYTB46SU=");
+}
\ No newline at end of file
diff --git a/tests/test_common.h b/tests/test_common.h
index 227eec24..158e70a5 100644
--- a/tests/test_common.h
+++ b/tests/test_common.h
@@ -38,3 +38,11 @@ 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_sha1_hash1(void **state);
+void test_sha1_hash2(void **state);
+void test_sha1_hash3(void **state);
+void test_sha1_hash4(void **state);
+void test_sha1_hash5(void **state);
+void test_sha1_hash6(void **state);
+void test_sha1_hash6(void **state);
+void test_sha1_hash7(void **state);
\ No newline at end of file
diff --git a/tests/testsuite.c b/tests/testsuite.c
index eb94cef2..f7d3619a 100644
--- a/tests/testsuite.c
+++ b/tests/testsuite.c
@@ -74,6 +74,13 @@ 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_sha1_hash1),
+        unit_test(test_sha1_hash2),
+        unit_test(test_sha1_hash3),
+        unit_test(test_sha1_hash4),
+        unit_test(test_sha1_hash5),
+        unit_test(test_sha1_hash6),
+        unit_test(test_sha1_hash7),
 
         unit_test(clear_empty),
         unit_test(reset_after_create),