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 dd41217edb07486fe54576a7a7ced07dd3fbcb9e..92cd54cbaf2f9cda132c826cf20af17df1596a0b 100644 (file)
--- 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 a9f0342b0a73ea80d693e3992be9e259a99cf7e3..9cd02e73600e25be3d3ea645b1ccbad329ae9ff3 100644 (file)
--- 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 44a02fd44204e52ed992a69229e98c1e16ffe32c..8349d513e32826e74473929a48835c10af73185e 100644 (file)
--- 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 8d38e745d6172eaf8e22929ada811aba59e78bde..6d28da9efb1440a26fd6af503dba36c9818c2f77 100644 (file)
--- 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 bef56c03b7f18e6dbb3cd4644f64af2618489e02..59c0a26ca86e1ac781839b2643a55e88f122c449 100644 (file)
--- 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 4fca1da15138f1f329cdeaa0c6d9738438dbe235..6f972f6704fb47f42b9562bfd82102077c75e1d9 100644 (file)
--- 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 33f16fc5910db0dcb47a4aec3c9b0655c1fd63b2..6d358183ed06c554698eaa676c8783f8985ccddc 100644 (file)
--- 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 3fc219a5eb4c6e20844f69abdcb5f3db96184990..d901e5bad2d39c920b6ec008e124396c01b01710 100644 (file)
--- 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 8c018892152aeb5ef765a25b7ec49a842fcd8738..cbfcc1a8542435ff0b626b69ae2e812de80aaaac 100644 (file)
--- 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.