diff options
| author |   naddy <naddy@openbsd.org> | 2016-09-27 21:31:20 +0000 |
|---|---|---|
| committer | naddy <naddy@openbsd.org> | 2016-09-27 21:31:20 +0000 |
| commit | 0c058166ac013c1aeaddb9c4fa44f543b8571387 (patch) | |
| tree | fb627c3284d75d2518d1a1d54f1c9ceccd284c96 | |
| parent | Run acpidump(8) at system startup and store ACPI tables in the (diff) | |
| download | wireguard-openbsd-0c058166ac013c1aeaddb9c4fa44f543b8571387.tar.xz wireguard-openbsd-0c058166ac013c1aeaddb9c4fa44f543b8571387.zip | |
switch to using the new package signature scheme (signify2) by default
ok sthen@
| -rw-r--r-- | usr.sbin/pkg_add/OpenBSD/PackingList.pm | 6 | ||||
| -rw-r--r-- | usr.sbin/pkg_add/OpenBSD/State.pm | 5 |
2 files changed, 5 insertions, 6 deletions
diff --git a/usr.sbin/pkg_add/OpenBSD/PackingList.pm b/usr.sbin/pkg_add/OpenBSD/PackingList.pm index d78ed8dbc5c..7e84032a7cc 100644 --- a/usr.sbin/pkg_add/OpenBSD/PackingList.pm +++ b/usr.sbin/pkg_add/OpenBSD/PackingList.pm @@ -1,5 +1,5 @@ # ex:ts=8 sw=4: -# $OpenBSD: PackingList.pm,v 1.140 2016/09/08 09:51:15 espie Exp $ +# $OpenBSD: PackingList.pm,v 1.141 2016/09/27 21:31:20 naddy Exp $ # # Copyright (c) 2003-2014 Marc Espie <espie@openbsd.org> # @@ -546,10 +546,10 @@ sub check_signature if ($sig->{key} eq 'x509') { require OpenBSD::x509; return OpenBSD::x509::check_signature($plist, $state); - } elsif ($sig->{key} eq 'signify') { + } elsif ($sig->{key} eq 'signify' && $state->defines('oldsign')) { require OpenBSD::signify; return OpenBSD::signify::check_signature($plist, $state); - } elsif ($sig->{key} eq 'signify2' && $state->defines('newsign')) { + } elsif ($sig->{key} eq 'signify2') { return 1; } else { $state->log("Error: unknown signature style $sig->{key}"); diff --git a/usr.sbin/pkg_add/OpenBSD/State.pm b/usr.sbin/pkg_add/OpenBSD/State.pm index 9f30a1e932a..dce6d294c4f 100644 --- a/usr.sbin/pkg_add/OpenBSD/State.pm +++ b/usr.sbin/pkg_add/OpenBSD/State.pm @@ -1,5 +1,5 @@ # ex:ts=8 sw=4: -# $OpenBSD: State.pm,v 1.38 2016/09/14 14:14:22 espie Exp $ +# $OpenBSD: State.pm,v 1.39 2016/09/27 21:31:20 naddy Exp $ # # Copyright (c) 2007-2014 Marc Espie <espie@openbsd.org> # @@ -346,7 +346,6 @@ sub handle_options }); $state->{v} = $state->opt('v'); - # XXX switch not flipped if ($state->defines('newsign')) { $state->{signature_style} //= 'new'; } elsif ($state->defines('unsigned')) { @@ -354,7 +353,7 @@ sub handle_options } elsif ($state->defines('oldsign')) { $state->{signature_style} //= 'old'; } else { - $state->{signature_style} //= 'old'; + $state->{signature_style} //= 'new'; } return if $state->{no_exports}; |