From: tedu <tedu@openbsd.org>
Date: Mon, 13 Jan 2014 01:41:34 +0000 (+0000)
Subject: new signify options. from and ok espie
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=c84e177da0dd0ccb6b9da7846c37982d8d6d2993;p=openbsd

new signify options. from and ok espie
---

diff --git a/usr.sbin/pkg_add/OpenBSD/signify.pm b/usr.sbin/pkg_add/OpenBSD/signify.pm
index a6703091312..cebdf8f8731 100644
--- a/usr.sbin/pkg_add/OpenBSD/signify.pm
+++ b/usr.sbin/pkg_add/OpenBSD/signify.pm
@@ -1,5 +1,5 @@
 # ex:ts=8 sw=4:
-# $OpenBSD: signify.pm,v 1.8 2014/01/10 14:34:02 espie Exp $
+# $OpenBSD: signify.pm,v 1.9 2014/01/13 01:41:34 tedu Exp $
 #
 # Copyright (c) 2013-2014 Marc Espie <espie@openbsd.org>
 #
@@ -38,7 +38,7 @@ sub compute_signature
 	open my $fh, ">", $contents;
 	$plist->write_no_sig($fh);
 	close $fh;
-	$state->system($cmd, '-s', $key, '-S', '--', $contents)
+	$state->system($cmd, '-s', $key, '-S', '-m', $contents)
 	    == 0 or die "probleme generating signature";
 	open(my $sighandle, '<', $sigfile)
 		or die "problem reading signature";
@@ -78,7 +78,7 @@ sub check_signature
 		$state->errsay("Package signed by untrusted party #1", $signer);
 		return 0;
 	}
-	if ($state->system($cmd, '-p', $pubkey, '-V', '--', $fname) != 0) {
+	if ($state->system($cmd, '-p', $pubkey, '-V', '-m', $fname) != 0) {
 	    	$state->log("Bad signature");
 		return 0;
 	}