turn the checksums stored in packing elements into real objects, so that

pkg_add becomes mostly independent of the type of checksum stored.

separate md5 into an abstract OpenBSD::digest class and an md5 subclass
with specific methods to compute checksums and serialize results, and create
an sha class that does the same thing with sha256 (with a base64 serializer)

1 files changed, 1 insertions, 1 deletions

diff --git a/usr.sbin/pkg_add/pkg_merge b/usr.sbin/pkg_add/pkg_merge
index c8bd09d61b9..aef85498b9c 100644
--- a/usr.sbin/pkg_add/pkg_merge
+++ b/usr.sbin/pkg_add/pkg_merge
@@ -221,7 +221,7 @@ while(1) {
 		my @todo = ();
 		my @merged = ();
 		for my $cmp (@mergeable) {
-		    if (defined $ref->{md5} && $cmp->{tocopy}->[0]->{md5} eq $ref->{md5}) {
+		    if (defined $ref->{d} && $cmp->{tocopy}->[0]->{d}->equals($ref->{d})) {
 		    	push(@merged, $cmp);
 			$currentprefix .= $cmp->{prefix};
 			$copies++;