From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 30 Jan 2021 14:30:29 +0000 (+0000)
Subject: libpakfire: Drop dependency on libgcrypt
X-Git-Tag: 0.9.28~1285^2~802
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4cbaf1d148344fdbbfa36fe8eb006ce334c2262a;p=pakfire.git

libpakfire: Drop dependency on libgcrypt

This library was chosen as a lightweight and more easy to use
alternative to OpenSSL.

Unfortunately it does not seem to be up to standard in terms of
reliability, performance and most importantly security.

Therefore we are using OpenSSL which is the de-facto standard library,
well-audited and has a transparent development process.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/Makefile.am b/Makefile.am
index 59af964b5..02d1e4c90 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -325,7 +325,6 @@ pkginclude_HEADERS += \
 libpakfire_la_CFLAGS = \
 	$(AM_CFLAGS) \
 	-fvisibility=hidden \
-	$(LIBGCRYPT_CFLAGS) \
 	$(OPENSSL_CFLAGS) \
 	$(SQLITE3_CFLAGS)
 
@@ -344,7 +343,6 @@ libpakfire_la_LIBADD = \
 	libpakfire-parser.la \
 	$(ARCHIVE_LIBS) \
 	$(GPGME_LIBS) \
-	$(LIBGCRYPT_LIBS) \
 	$(LZMA_LIBS) \
 	$(OPENSSL_LIBS) \
 	$(SOLV_LIBS) \
diff --git a/configure.ac b/configure.ac
index bcf148a08..87b686bbe 100644
--- a/configure.ac
+++ b/configure.ac
@@ -179,7 +179,6 @@ PKG_CHECK_MODULES([LZMA], [liblzma])
 PKG_CHECK_MODULES([OPENSSL], [openssl >= 1.1.1])
 PKG_CHECK_MODULES([SQLITE3], [sqlite3])
 
-AM_PATH_LIBGCRYPT([1.8.0], [], [AC_MSG_ERROR([*** libgcrypt not found])])
 AM_PATH_GPGME([1.6.0], [], [AC_MSG_ERROR([*** GPGME not found])])
 
 AC_ARG_WITH([systemdsystemunitdir],
diff --git a/src/libpakfire/include/pakfire/util.h b/src/libpakfire/include/pakfire/util.h
index 83c62af01..100971acb 100644
--- a/src/libpakfire/include/pakfire/util.h
+++ b/src/libpakfire/include/pakfire/util.h
@@ -56,8 +56,6 @@ char* pakfire_remove_trailing_newline(char* str);
 
 const char* pakfire_action_type_string(pakfire_action_type_t type);
 
-void init_libgcrypt();
-
 int pakfire_read_file_into_buffer(FILE* f, char** buffer, size_t* len);
 
 size_t pakfire_string_to_size(const char* s);
diff --git a/src/libpakfire/util.c b/src/libpakfire/util.c
index c5f8e648c..8abcffdb1 100644
--- a/src/libpakfire/util.c
+++ b/src/libpakfire/util.c
@@ -30,8 +30,6 @@
 #include <time.h>
 #include <unistd.h>
 
-#include <gcrypt.h>
-
 #include <pakfire/constants.h>
 #include <pakfire/logging.h>
 #include <pakfire/private.h>
@@ -281,25 +279,6 @@ char* pakfire_remove_trailing_newline(char* str) {
 	return str;
 }
 
-void init_libgcrypt() {
-	// Only execute this once
-	static int libgcrypt_initialized = 0;
-	if (libgcrypt_initialized++)
-		return;
-
-	const char* version = gcry_check_version(NULL);
-	if (!version) {
-		fprintf(stderr, "Could not initialize libgcrypt\n");
-		exit(1);
-	}
-
-	// Disable secure memory
-	gcry_control(GCRYCTL_DISABLE_SECMEM, 0);
-
-	// Tell libgcrypt that initialization has completed
-	gcry_control(GCRYCTL_INITIALIZATION_FINISHED, 0);
-}
-
 PAKFIRE_EXPORT const char* pakfire_action_type_string(pakfire_action_type_t type) {
 	switch (type) {
 		case PAKFIRE_ACTION_NOOP: