Skip to content

Commit

Permalink
Merge pull request coreos#3417 from cgwalters/headers-sha256
Browse files Browse the repository at this point in the history
  • Loading branch information
jlebon authored Feb 9, 2022
2 parents 4a45703 + c81a3f8 commit 4493630
Showing 1 changed file with 2 additions and 11 deletions.
13 changes: 2 additions & 11 deletions src/libpriv/rpmostree-rpm-util.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -431,11 +431,8 @@ rpmhdrs_rpmdbv (struct RpmHeaders *l1,
GCancellable *cancellable,
GError **error)
{
GChecksum *checksum = g_checksum_new (G_CHECKSUM_SHA1);
g_autofree char *checksum_cstr = NULL;
char *ret = NULL;
g_autoptr(GChecksum) checksum = g_checksum_new (G_CHECKSUM_SHA256);
int num = 0;

while (num < l1->hs->len)
{
auto pkg = static_cast<Header>(l1->hs->pdata[num++]);
Expand All @@ -444,13 +441,7 @@ rpmhdrs_rpmdbv (struct RpmHeaders *l1,
g_checksum_update (checksum, (guint8*)envra, strlen(envra));
}

checksum_cstr = g_strdup (g_checksum_get_string (checksum));

ret = g_strdup_printf ("%u:%s", num, checksum_cstr);

g_checksum_free (checksum);

return ret;
return g_strdup_printf ("%u:%s", num, g_checksum_get_string (checksum));
}

/* glib? */
Expand Down

0 comments on commit 4493630

Please sign in to comment.