summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc Espie <espie@cvs.openbsd.org>2017-10-07 13:23:06 +0000
committerMarc Espie <espie@cvs.openbsd.org>2017-10-07 13:23:06 +0000
commit1db09b6795fc57fe02243cc28aa9be500c6fff16 (patch)
tree14cbb5393170a1b743754419c8cf96f3c584cc6a
parentdf2ccea670ed28f6ed55830c5f32793651e24c12 (diff)
kill reporting old signature schemes, they've been gone for long enough
-rw-r--r--usr.sbin/pkg_add/OpenBSD/PkgInfo.pm12
1 files changed, 5 insertions, 7 deletions
diff --git a/usr.sbin/pkg_add/OpenBSD/PkgInfo.pm b/usr.sbin/pkg_add/OpenBSD/PkgInfo.pm
index 0d0c7bc9c43..7423e32e35f 100644
--- a/usr.sbin/pkg_add/OpenBSD/PkgInfo.pm
+++ b/usr.sbin/pkg_add/OpenBSD/PkgInfo.pm
@@ -1,6 +1,6 @@
#! /usr/bin/perl
# ex:ts=8 sw=4:
-# $OpenBSD: PkgInfo.pm,v 1.48 2017/10/07 10:35:34 espie Exp $
+# $OpenBSD: PkgInfo.pm,v 1.49 2017/10/07 13:23:05 espie Exp $
#
# Copyright (c) 2003-2014 Marc Espie <espie@openbsd.org>
#
@@ -462,14 +462,12 @@ sub print_info
$state->header($handle);
if ($plist->is_signed) {
my $sig = $plist->get('digital-signature');
- if ($sig->{key} eq 'x509') {
- require OpenBSD::x509;
- $state->banner("Certificate info:");
- OpenBSD::x509::print_certificate_info($plist);
- } elsif ($sig->{key} eq 'signify' ||
- $sig->{key} eq 'signify2') {
+ if ($sig->{key} eq 'signify2') {
$state->say("reportedly signed by #1",
$plist->get('signer')->name);
+ } else {
+ $state->say("\@digital-signature #1: no currently supported signature",
+ $sig->{key});
}
} else {
$state->banner("No digital signature");