From c36a274c633c08115b6006622112f5609031001e Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Wed, 19 Feb 2020 03:02:04 +0000 Subject: CTAN sync 202002190302 --- systems/texlive/tlnet/tlpkg/TeXLive/TLPDB.pm | 59 +++++----------------------- 1 file changed, 9 insertions(+), 50 deletions(-) (limited to 'systems/texlive/tlnet/tlpkg/TeXLive/TLPDB.pm') diff --git a/systems/texlive/tlnet/tlpkg/TeXLive/TLPDB.pm b/systems/texlive/tlnet/tlpkg/TeXLive/TLPDB.pm index 4dd848a1d2..ce00df5bf7 100644 --- a/systems/texlive/tlnet/tlpkg/TeXLive/TLPDB.pm +++ b/systems/texlive/tlnet/tlpkg/TeXLive/TLPDB.pm @@ -1,12 +1,12 @@ -# $Id: TLPDB.pm 53706 2020-02-07 01:48:10Z preining $ +# $Id: TLPDB.pm 53820 2020-02-17 03:23:13Z preining $ # TeXLive::TLPDB.pm - tlpdb plain text database files. -# Copyright 2007-2019 Norbert Preining +# Copyright 2007-2020 Norbert Preining # This file is licensed under the GNU General Public License version 2 # or any later version. package TeXLive::TLPDB; -my $svnrev = '$Revision: 53706 $'; +my $svnrev = '$Revision: 53820 $'; my $_modulerevision = ($svnrev =~ m/: ([0-9]+) /) ? $1 : "unknown"; sub module_revision { return $_modulerevision; } @@ -370,57 +370,16 @@ sub from_file { # # before we open and proceed, verify the downloaded file if ($params{'verify'} && $media ne 'local_uncompressed') { - my ($r, $m) = TeXLive::TLCrypto::verify_checksum($tlpdbfile, "$path.$ChecksumExtension"); - if ($r == $VS_CHECKSUM_ERROR) { - tldie("$0: checksum error when downloading $tlpdbfile from $path: $m\n"); - } elsif ($r == $VS_SIGNATURE_ERROR) { - tldie("$0: signature verification error of $tlpdbfile from $path: $m\n"); - } elsif ($r == $VS_CONNECTION_ERROR) { - tldie("$0: cannot download: $m\n"); - } elsif ($r == $VS_UNSIGNED) { - debug("$0: remote database checksum is not signed, continuing anyway: $m\n"); - $self->verification_status($r); - } elsif ($r == $VS_GPG_UNAVAILABLE) { - debug("$0: TLPDB: no gpg available, continuing anyway!\n"); - $self->verification_status($r); - } elsif ($r == $VS_PUBKEY_MISSING) { - debug("$0: TLPDB: pubkey missing, continuing anyway!\n"); - $self->verification_status($r); - } elsif ($r == $VS_VERIFIED) { - $is_verified = 1; - $self->verification_status($r); - } else { - tldie("$0: unexpected return value from verify_checksum: $r\n"); - } + my ($verified, $status) = TeXLive::TLCrypto::verify_checksum_and_check_return($tlpdbfile, $path); + $is_verified = $verified; + $self->verification_status($status); } open($retfh, "<$tlpdbfile") || die "$0: open($tlpdbfile) failed: $!"; } else { if ($params{'verify'} && $media ne 'local_uncompressed') { - my ($r, $m) = TeXLive::TLCrypto::verify_checksum($path, "$path.$ChecksumExtension"); - if ($r == $VS_CHECKSUM_ERROR) { - tldie("$0: checksum error when downloading $path from $path: $m\n"); - } elsif ($r == $VS_SIGNATURE_ERROR) { - tldie("$0: signature verification error of $path from $path: $m\n"); - } elsif ($r == $VS_CONNECTION_ERROR) { - tldie("$0: cannot download: $m\n"); - } elsif ($r == $VS_UNSIGNED) { - debug("$0: remote database checksum is not signed, continuing anyway!\n"); - $self->verification_status($r); - } elsif ($r == $VS_GPG_UNAVAILABLE) { - debug("$0: TLPDB: no gpg available, continuing anyway!\n"); - $self->verification_status($r); - } elsif ($r == $VS_PUBKEY_MISSING) { - debug("$0: TLPDB: pubkey missing, continuing anyway!\n"); - $self->verification_status($r); - } elsif ($r == $VS_EXPKEYSIG) { - debug("$0: TLPDB: signature verified, but key expired, continuing anyway!\n"); - $self->verification_status($r); - } elsif ($r == $VS_VERIFIED) { - $is_verified = 1; - $self->verification_status($r); - } else { - tldie("$0: unexpected return value from verify_checksum: $r\n"); - } + my ($verified, $status) = TeXLive::TLCrypto::verify_checksum_and_check_return($path, $path); + $is_verified = $verified; + $self->verification_status($status); } open(TMP, "<$path") || die "$0: open($path) failed: $!"; $retfh = \*TMP; -- cgit v1.2.3