Revert the repodata signature stuff.
This commit is contained in:
parent
4ddb335c8e
commit
850ba2d416
@ -44,7 +44,6 @@ repodata_flush(struct xbps_handle *xhp, const char *repodir,
|
|||||||
{
|
{
|
||||||
struct archive *ar;
|
struct archive *ar;
|
||||||
char *repofile, *tname, *buf;
|
char *repofile, *tname, *buf;
|
||||||
unsigned char *sig = NULL;
|
|
||||||
int rv, repofd = -1;
|
int rv, repofd = -1;
|
||||||
mode_t mask;
|
mode_t mask;
|
||||||
bool result;
|
bool result;
|
||||||
@ -92,8 +91,7 @@ repodata_flush(struct xbps_handle *xhp, const char *repodir,
|
|||||||
buf = xbps_dictionary_externalize(idx);
|
buf = xbps_dictionary_externalize(idx);
|
||||||
if (buf == NULL)
|
if (buf == NULL)
|
||||||
return false;
|
return false;
|
||||||
buflen = strlen(buf);
|
rv = xbps_archive_append_buf(ar, buf, strlen(buf),
|
||||||
rv = xbps_archive_append_buf(ar, buf, buflen,
|
|
||||||
XBPS_REPOIDX, 0644, "root", "root");
|
XBPS_REPOIDX, 0644, "root", "root");
|
||||||
free(buf);
|
free(buf);
|
||||||
if (rv != 0)
|
if (rv != 0)
|
||||||
|
10
lib/repo.c
10
lib/repo.c
@ -77,15 +77,7 @@ repo_get_dict(struct xbps_repo *repo)
|
|||||||
archive_error_string(repo->ar));
|
archive_error_string(repo->ar));
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
dict = xbps_archive_get_dictionary(repo->ar, entry, &bytes);
|
return xbps_archive_get_dictionary(repo->ar, entry);
|
||||||
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;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
bool
|
bool
|
||||||
|
Loading…
x
Reference in New Issue
Block a user