From 850ba2d4161b2cfc7f138e3c610e868d0d17297f Mon Sep 17 00:00:00 2001 From: Juan RP Date: Mon, 6 Jan 2020 14:56:01 +0100 Subject: [PATCH] Revert the repodata signature stuff. --- bin/xbps-rindex/repoflush.c | 4 +--- lib/repo.c | 10 +--------- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/bin/xbps-rindex/repoflush.c b/bin/xbps-rindex/repoflush.c index 213416a5..eb08bcfa 100644 --- a/bin/xbps-rindex/repoflush.c +++ b/bin/xbps-rindex/repoflush.c @@ -44,7 +44,6 @@ repodata_flush(struct xbps_handle *xhp, const char *repodir, { struct archive *ar; char *repofile, *tname, *buf; - unsigned char *sig = NULL; int rv, repofd = -1; mode_t mask; bool result; @@ -92,8 +91,7 @@ repodata_flush(struct xbps_handle *xhp, const char *repodir, buf = xbps_dictionary_externalize(idx); if (buf == NULL) return false; - buflen = strlen(buf); - rv = xbps_archive_append_buf(ar, buf, buflen, + rv = xbps_archive_append_buf(ar, buf, strlen(buf), XBPS_REPOIDX, 0644, "root", "root"); free(buf); if (rv != 0) diff --git a/lib/repo.c b/lib/repo.c index 04646bc1..1b0755d2 100644 --- a/lib/repo.c +++ b/lib/repo.c @@ -77,15 +77,7 @@ repo_get_dict(struct xbps_repo *repo) archive_error_string(repo->ar)); return NULL; } - dict = xbps_archive_get_dictionary(repo->ar, entry, &bytes); - idxmeta = (repo->idxmeta != NULL) ? repo->idxmeta : dict; - if (verified != NULL && bytes != NULL) { - digest = xbps_buffer_hash_raw(bytes, strlen(bytes)); - *verified = repo_verify_index(repo, idxmeta, digest); - } - free(digest); - free(bytes); - return dict; + return xbps_archive_get_dictionary(repo->ar, entry); } bool