From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 19 Aug 2022 11:53:19 +0000 (+0000)
Subject: Drop support for SHA-1
X-Git-Tag: 0.9.28~428
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0a31f8fe4c69e90786ad3d4245028e57d2283fbf;p=pakfire.git

Drop support for SHA-1

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

diff --git a/src/_pakfire/_pakfiremodule.c b/src/_pakfire/_pakfiremodule.c
index dd41217ed..92cd54cba 100644
--- a/src/_pakfire/_pakfiremodule.c
+++ b/src/_pakfire/_pakfiremodule.c
@@ -90,8 +90,6 @@ PyMODINIT_FUNC PyInit__pakfire(void) {
 		return NULL;
 	if (PyModule_AddIntMacro(module, PAKFIRE_DIGEST_SHA256))
 		return NULL;
-	if (PyModule_AddIntMacro(module, PAKFIRE_DIGEST_SHA1))
-		return NULL;
 
 	// Pakfire
 	if (PyType_Ready(&PakfireType) < 0)
diff --git a/src/libpakfire/db.c b/src/libpakfire/db.c
index a9f0342b0..9cd02e736 100644
--- a/src/libpakfire/db.c
+++ b/src/libpakfire/db.c
@@ -851,7 +851,6 @@ static const struct pakfire_digest {
 } pakfire_digests[] = {
 	{ PAKFIRE_DIGEST_SHA512, "sha512:" },
 	{ PAKFIRE_DIGEST_SHA256, "sha256:" },
-	{ PAKFIRE_DIGEST_SHA1, "sha1:" },
 	{ PAKFIRE_DIGEST_NONE, NULL },
 };
 
@@ -987,7 +986,6 @@ static int pakfire_db_file_add_digests(struct pakfire_db* db, unsigned long id,
 	static enum pakfire_digests digests[] = {
 		PAKFIRE_DIGEST_SHA512,
 		PAKFIRE_DIGEST_SHA256,
-		PAKFIRE_DIGEST_SHA1,
 
 		// Sentinel
 		PAKFIRE_DIGEST_NONE,
diff --git a/src/libpakfire/downloader.c b/src/libpakfire/downloader.c
index 44a02fd44..8349d513e 100644
--- a/src/libpakfire/downloader.c
+++ b/src/libpakfire/downloader.c
@@ -358,10 +358,6 @@ static struct pakfire_transfer* pakfire_downloader_create_transfer(
 			transfer->md = EVP_sha256();
 			break;
 
-		case PAKFIRE_DIGEST_SHA1:
-			transfer->md = EVP_sha1();
-			break;
-
 		case PAKFIRE_DIGEST_NONE:
 			break;
 	}
diff --git a/src/libpakfire/file.c b/src/libpakfire/file.c
index 8d38e745d..6d28da9ef 100644
--- a/src/libpakfire/file.c
+++ b/src/libpakfire/file.c
@@ -129,7 +129,6 @@ static const struct pakfire_libarchive_digest {
 } pakfire_libarchive_digests[] = {
 	{ PAKFIRE_DIGEST_SHA512, ARCHIVE_ENTRY_DIGEST_SHA512 },
 	{ PAKFIRE_DIGEST_SHA256, ARCHIVE_ENTRY_DIGEST_SHA256 },
-	{ PAKFIRE_DIGEST_SHA1, ARCHIVE_ENTRY_DIGEST_SHA1 },
 	{ PAKFIRE_DIGEST_NONE, 0 },
 };
 
diff --git a/src/libpakfire/filelist.c b/src/libpakfire/filelist.c
index bef56c03b..59c0a26ca 100644
--- a/src/libpakfire/filelist.c
+++ b/src/libpakfire/filelist.c
@@ -202,10 +202,7 @@ static int pakfire_filelist_parse_line(struct pakfire_file** file, struct pakfir
 
 				// checksum
 				case 6:
-					if (strcmp(word, "-") == 0)
-						break;
-
-					pakfire_file_set_hexdigest(*file, PAKFIRE_DIGEST_SHA1, word);
+					// We don't support SHA-1 any more
 					break;
 
 				// path
@@ -256,10 +253,7 @@ static int pakfire_filelist_parse_line(struct pakfire_file** file, struct pakfir
 
 				// checksum
 				case 7:
-					if (strcmp(word, "-") == 0)
-						break;
-
-					pakfire_file_set_hexdigest(*file, PAKFIRE_DIGEST_SHA1, word);
+					// We don't support SHA-1 any more
 					break;
 			}
 		}
diff --git a/src/libpakfire/include/pakfire/pakfire.h b/src/libpakfire/include/pakfire/pakfire.h
index 4fca1da15..6f972f670 100644
--- a/src/libpakfire/include/pakfire/pakfire.h
+++ b/src/libpakfire/include/pakfire/pakfire.h
@@ -31,9 +31,8 @@ struct pakfire;
 
 enum pakfire_digests {
 	PAKFIRE_DIGEST_NONE   = 0,
-	PAKFIRE_DIGEST_SHA1   = 1,
-	PAKFIRE_DIGEST_SHA256 = 2,
-	PAKFIRE_DIGEST_SHA512 = 3,
+	PAKFIRE_DIGEST_SHA256 = 1,
+	PAKFIRE_DIGEST_SHA512 = 2,
 };
 
 #include <pakfire/key.h>
diff --git a/src/libpakfire/package.c b/src/libpakfire/package.c
index 33f16fc59..6d358183e 100644
--- a/src/libpakfire/package.c
+++ b/src/libpakfire/package.c
@@ -457,10 +457,6 @@ PAKFIRE_EXPORT int pakfire_package_set_digest(struct pakfire_package* pkg,
 			id = REPOKEY_TYPE_SHA512;
 			break;
 
-		case PAKFIRE_DIGEST_SHA1:
-			id = REPOKEY_TYPE_SHA1;
-			break;
-
 		default:
 			errno = ENOTSUP;
 			return 1;
@@ -1152,10 +1148,6 @@ PAKFIRE_EXPORT char* pakfire_package_dump(struct pakfire_package* pkg, int flags
 				pakfire_package_dump_add_line(&string, _("SHA256 Digest"), hexdigest);
 				break;
 
-			case PAKFIRE_DIGEST_SHA1:
-				pakfire_package_dump_add_line(&string, _("SHA1 Digest"), hexdigest);
-				break;
-
 			case PAKFIRE_DIGEST_NONE:
 				break;
 		}
diff --git a/src/libpakfire/util.c b/src/libpakfire/util.c
index 3fc219a5e..d901e5bad 100644
--- a/src/libpakfire/util.c
+++ b/src/libpakfire/util.c
@@ -480,9 +480,6 @@ size_t pakfire_digest_length(enum pakfire_digests digest) {
 		case PAKFIRE_DIGEST_SHA256:
 			return 32;
 
-		case PAKFIRE_DIGEST_SHA1:
-			return 20;
-
 		case PAKFIRE_DIGEST_NONE:
 			return 0;
 	}
diff --git a/src/pakfire/constants.py b/src/pakfire/constants.py
index 8c0188921..cbfcc1a85 100644
--- a/src/pakfire/constants.py
+++ b/src/pakfire/constants.py
@@ -29,7 +29,6 @@ from .__version__ import PAKFIRE_VERSION
 from ._pakfire import (
 	PAKFIRE_DIGEST_SHA512,
 	PAKFIRE_DIGEST_SHA256,
-	PAKFIRE_DIGEST_SHA1,
 )
 
 # The default hub to connect to.