diff options
| author | Marc Espie <espie@cvs.openbsd.org> | 2009-10-14 11:06:42 +0000 |
|---|---|---|
| committer | Marc Espie <espie@cvs.openbsd.org> | 2009-10-14 11:06:42 +0000 |
| commit | c69bd1e7a9ad85db9fdb7c5afe575467890cef5f (patch) | |
| tree | 47f2682cc639993e9f0187fc5ef936ae599073c2 /usr.sbin/pkg_add/OpenBSD | |
| parent | d8b6ed5e3e9c841e156a3ae99b8a7482a508e7c3 (diff) | |
make signature checking more quiet: discard openssl's STDERR, keep a tally
of signed packages.
- display a message only if signed packages have been signed.
- show IN BIG CAPS unsigned package numbers if a mixture of signed/unsigned
has been seen.
Diffstat (limited to 'usr.sbin/pkg_add/OpenBSD')
| -rw-r--r-- | usr.sbin/pkg_add/OpenBSD/x509.pm | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/usr.sbin/pkg_add/OpenBSD/x509.pm b/usr.sbin/pkg_add/OpenBSD/x509.pm index 07d73a68627..944f16aeb02 100644 --- a/usr.sbin/pkg_add/OpenBSD/x509.pm +++ b/usr.sbin/pkg_add/OpenBSD/x509.pm @@ -1,5 +1,5 @@ # ex:ts=8 sw=4: -# $OpenBSD: x509.pm,v 1.1 2009/04/14 17:53:58 espie Exp $ +# $OpenBSD: x509.pm,v 1.2 2009/10/14 11:06:41 espie Exp $ # # Copyright (c) 2003-2007 Marc Espie <espie@openbsd.org> # @@ -77,6 +77,20 @@ sub print_certificate_info unlink $fname; } +sub system_quiet +{ + my $r = fork; + if (!defined $r) { + return 1; + } elsif ($r == 0) { + open STDERR, ">/dev/null"; + exec {$_[0]} @_ or return 1; + } else { + waitpid($r, 0); + return $?; + } +} + sub check_signature { my ($plist, $state) = @_; @@ -91,8 +105,8 @@ sub check_signature print $fh2 decode_base64($sig->{b64sig}); close $fh; close $fh2; - if (system (OpenBSD::Paths->openssl, "smime", "-verify", "-binary", - "-inform", "DEM", "-in", $fname2, "-content", $fname, + if (system_quiet (OpenBSD::Paths->openssl, "smime", "-verify", + "-binary", "-inform", "DEM", "-in", $fname2, "-content", $fname, "-CAfile", OpenBSD::Paths->pkgca, "-out", "/dev/null") != 0) { $state->warn("Bad signature"); return 0; |