[src/trunk]: src/tests/usr.bin/netpgpverify Since the netpgpverify rewrite to...

To: source-changes-hg%NetBSD.org@localhost
Subject: [src/trunk]: src/tests/usr.bin/netpgpverify Since the netpgpverify rewrite to...
From: agc <agc%NetBSD.org@localhost>
Date: Tue, 31 Jul 2018 18:57:03 +0000
details:   https://anonhg.NetBSD.org/src/rev/c4c50983fd94
branches:  trunk
changeset: 333945:c4c50983fd94
user:      agc <agc%NetBSD.org@localhost>
date:      Sun Nov 23 01:56:35 2014 +0000

description:
Since the netpgpverify rewrite to have no external pre-requisites, the
output format for signatures has changed cosmetically (mainly
whitespace changes).  Re-format all the test cases so that the tests
now pass again with the new output format:

        Tests root: /usr/tests/usr.bin/netpgpverify

        t_netpgpverify (1/1): 2 test cases
            netpgpverify_dsa: [0.261980s] Passed.
            netpgpverify_rsa: [0.237469s] Passed.
        [0.509571s]

        Summary for 1 test programs:
            2 passed test cases.
            0 failed test cases.
            0 expected failed test cases.
            0 skipped test cases.

diffstat:

 tests/usr.bin/netpgpverify/t_netpgpverify.sh |  164 +++++++++++---------------
 1 files changed, 67 insertions(+), 97 deletions(-)

diffs (253 lines):

diff -r 68bf7f34f8b5 -r c4c50983fd94 tests/usr.bin/netpgpverify/t_netpgpverify.sh
--- a/tests/usr.bin/netpgpverify/t_netpgpverify.sh      Sun Nov 23 01:47:59 2014 +0000
+++ b/tests/usr.bin/netpgpverify/t_netpgpverify.sh      Sun Nov 23 01:56:35 2014 +0000
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# $NetBSD: t_netpgpverify.sh,v 1.1 2012/11/20 07:55:54 agc Exp $
+# $NetBSD: t_netpgpverify.sh,v 1.2 2014/11/23 01:56:35 agc Exp $
 
 # Copyright (c) 2012 Alistair Crooks <agc%NetBSD.org@localhost>
 # All rights reserved.
@@ -8420,14 +8420,12 @@
 EOF
        cat > expected16 << EOF
 Good signature for b.gpg made Mon Sep 10 00:15:38 2012
-signature  2048/RSA (Encrypt or Sign) 1b68dcfcc0596823 2004-01-12
-fingerprint:  d415 9deb 336d e4cc cdfa 00cd 1b68 dcfc c059 6823 
-uid              Alistair Crooks <agc%alistaircrooks.com@localhost>
-uid              Alistair Crooks <agc%pkgsrc.org@localhost>
-uid              Alistair Crooks <agc%netbsd.org@localhost>
-uid              Alistair Crooks <agc%netflix.com@localhost>
-encryption 2048/RSA (Encrypt or Sign) 79deb61e488eee74 2004-01-12
-fingerprint:  57c0 c1e6 bf71 8845 416b 9522 79de b61e 488e ee74 
+signature     2048/RSA (Encrypt or Sign) 1b68dcfcc0596823 2004-01-12
+fingerprint   d415 9deb 336d e4cc cdfa 00cd 1b68 dcfc c059 6823 
+uid           Alistair Crooks <agc%alistaircrooks.com@localhost>
+uid           Alistair Crooks <agc%pkgsrc.org@localhost>
+uid           Alistair Crooks <agc%netbsd.org@localhost>
+uid           Alistair Crooks <agc%netflix.com@localhost>
 
 EOF
        cat >expected17 <<EOF
@@ -8497,14 +8495,12 @@
 EOF
        cat >expected22 <<EOF
 Good signature for [stdin] made Sun Sep 30 10:50:20 2012
-signature  2048/RSA (Encrypt or Sign) 1b68dcfcc0596823 2004-01-12
-fingerprint:  d415 9deb 336d e4cc cdfa 00cd 1b68 dcfc c059 6823 
-uid              Alistair Crooks <agc%alistaircrooks.com@localhost>
-uid              Alistair Crooks <agc%pkgsrc.org@localhost>
-uid              Alistair Crooks <agc%netbsd.org@localhost>
-uid              Alistair Crooks <agc%netflix.com@localhost>
-encryption 2048/RSA (Encrypt or Sign) 79deb61e488eee74 2004-01-12
-fingerprint:  57c0 c1e6 bf71 8845 416b 9522 79de b61e 488e ee74 
+signature     2048/RSA (Encrypt or Sign) 1b68dcfcc0596823 2004-01-12
+fingerprint   d415 9deb 336d e4cc cdfa 00cd 1b68 dcfc c059 6823 
+uid           Alistair Crooks <agc%alistaircrooks.com@localhost>
+uid           Alistair Crooks <agc%pkgsrc.org@localhost>
+uid           Alistair Crooks <agc%netbsd.org@localhost>
+uid           Alistair Crooks <agc%netflix.com@localhost>
 
 EOF
        cat >expected23 <<EOF
@@ -8518,14 +8514,12 @@
 EOF
        cat >expected24 <<EOF
 Good signature for [stdin] made Mon Sep 10 00:15:38 2012
-signature  2048/RSA (Encrypt or Sign) 1b68dcfcc0596823 2004-01-12
-fingerprint:  d415 9deb 336d e4cc cdfa 00cd 1b68 dcfc c059 6823 
-uid              Alistair Crooks <agc%alistaircrooks.com@localhost>
-uid              Alistair Crooks <agc%pkgsrc.org@localhost>
-uid              Alistair Crooks <agc%netbsd.org@localhost>
-uid              Alistair Crooks <agc%netflix.com@localhost>
-encryption 2048/RSA (Encrypt or Sign) 79deb61e488eee74 2004-01-12
-fingerprint:  57c0 c1e6 bf71 8845 416b 9522 79de b61e 488e ee74 
+signature     2048/RSA (Encrypt or Sign) 1b68dcfcc0596823 2004-01-12
+fingerprint   d415 9deb 336d e4cc cdfa 00cd 1b68 dcfc c059 6823 
+uid           Alistair Crooks <agc%alistaircrooks.com@localhost>
+uid           Alistair Crooks <agc%pkgsrc.org@localhost>
+uid           Alistair Crooks <agc%netbsd.org@localhost>
+uid           Alistair Crooks <agc%netflix.com@localhost>
 
 EOF
        cat >expected25 <<EOF
@@ -8548,20 +8542,16 @@
 EOF
        cat >expected27 <<EOF
 Good signature for [stdin] made Mon Oct 15 09:28:54 2012
-signature  4096/RSA (Encrypt or Sign) 064973ac4c4a706e 2009-06-23
-fingerprint:  ddee 2bdb 9c98 a0d1 d4fb dbf7 0649 73ac 4c4a 706e 
-uid              NetBSD Security Officer <security-officer%NetBSD.org@localhost>
-encryption 4096/RSA (Encrypt or Sign) 9ff2c24fdf2ce620 2009-06-23 [Expiry 2019-06-21]
-fingerprint:  1915 0801 fbd8 f45d 89f2 0205 9ff2 c24f df2c e620 
+signature     4096/RSA (Encrypt or Sign) 064973ac4c4a706e 2009-06-23
+fingerprint   ddee 2bdb 9c98 a0d1 d4fb dbf7 0649 73ac 4c4a 706e 
+uid           NetBSD Security Officer <security-officer%NetBSD.org@localhost>
 
 EOF
        cat >expected28 <<EOF
 Good signature for NetBSD-6.0_hashes.asc made Mon Oct 15 09:28:54 2012
-signature  4096/RSA (Encrypt or Sign) 064973ac4c4a706e 2009-06-23
-fingerprint:  ddee 2bdb 9c98 a0d1 d4fb dbf7 0649 73ac 4c4a 706e 
-uid              NetBSD Security Officer <security-officer%NetBSD.org@localhost>
-encryption 4096/RSA (Encrypt or Sign) 9ff2c24fdf2ce620 2009-06-23 [Expiry 2019-06-21]
-fingerprint:  1915 0801 fbd8 f45d 89f2 0205 9ff2 c24f df2c e620 
+signature     4096/RSA (Encrypt or Sign) 064973ac4c4a706e 2009-06-23
+fingerprint   ddee 2bdb 9c98 a0d1 d4fb dbf7 0649 73ac 4c4a 706e 
+uid           NetBSD Security Officer <security-officer%NetBSD.org@localhost>
 
 EOF
        cat >expected29 <<EOF
@@ -8597,34 +8587,28 @@
 EOF
        cat >expected32 <<EOF
 Good signature for b.gpg made Mon Sep 10 00:15:38 2012
-signature  2048/RSA (Encrypt or Sign) 1b68dcfcc0596823 2004-01-12
-fingerprint:  d415 9deb 336d e4cc cdfa 00cd 1b68 dcfc c059 6823 
-uid              Alistair Crooks <agc%alistaircrooks.com@localhost>
-uid              Alistair Crooks <agc%pkgsrc.org@localhost>
-uid              Alistair Crooks <agc%netbsd.org@localhost>
-uid              Alistair Crooks <agc%netflix.com@localhost>
-encryption 2048/RSA (Encrypt or Sign) 79deb61e488eee74 2004-01-12
-fingerprint:  57c0 c1e6 bf71 8845 416b 9522 79de b61e 488e ee74 
+signature     2048/RSA (Encrypt or Sign) 1b68dcfcc0596823 2004-01-12
+fingerprint   d415 9deb 336d e4cc cdfa 00cd 1b68 dcfc c059 6823 
+uid           Alistair Crooks <agc%alistaircrooks.com@localhost>
+uid           Alistair Crooks <agc%pkgsrc.org@localhost>
+uid           Alistair Crooks <agc%netbsd.org@localhost>
+uid           Alistair Crooks <agc%netflix.com@localhost>
 
 Good signature for b.gpg made Mon Sep 10 00:15:38 2012
-signature  2048/RSA (Encrypt or Sign) 1b68dcfcc0596823 2004-01-12
-fingerprint:  d415 9deb 336d e4cc cdfa 00cd 1b68 dcfc c059 6823 
-uid              Alistair Crooks <agc%alistaircrooks.com@localhost>
-uid              Alistair Crooks <agc%pkgsrc.org@localhost>
-uid              Alistair Crooks <agc%netbsd.org@localhost>
-uid              Alistair Crooks <agc%netflix.com@localhost>
-encryption 2048/RSA (Encrypt or Sign) 79deb61e488eee74 2004-01-12
-fingerprint:  57c0 c1e6 bf71 8845 416b 9522 79de b61e 488e ee74 
+signature     2048/RSA (Encrypt or Sign) 1b68dcfcc0596823 2004-01-12
+fingerprint   d415 9deb 336d e4cc cdfa 00cd 1b68 dcfc c059 6823 
+uid           Alistair Crooks <agc%alistaircrooks.com@localhost>
+uid           Alistair Crooks <agc%pkgsrc.org@localhost>
+uid           Alistair Crooks <agc%netbsd.org@localhost>
+uid           Alistair Crooks <agc%netflix.com@localhost>
 
 Good signature for b.gpg made Mon Sep 10 00:15:38 2012
-signature  2048/RSA (Encrypt or Sign) 1b68dcfcc0596823 2004-01-12
-fingerprint:  d415 9deb 336d e4cc cdfa 00cd 1b68 dcfc c059 6823 
-uid              Alistair Crooks <agc%alistaircrooks.com@localhost>
-uid              Alistair Crooks <agc%pkgsrc.org@localhost>
-uid              Alistair Crooks <agc%netbsd.org@localhost>
-uid              Alistair Crooks <agc%netflix.com@localhost>
-encryption 2048/RSA (Encrypt or Sign) 79deb61e488eee74 2004-01-12
-fingerprint:  57c0 c1e6 bf71 8845 416b 9522 79de b61e 488e ee74 
+signature     2048/RSA (Encrypt or Sign) 1b68dcfcc0596823 2004-01-12
+fingerprint   d415 9deb 336d e4cc cdfa 00cd 1b68 dcfc c059 6823 
+uid           Alistair Crooks <agc%alistaircrooks.com@localhost>
+uid           Alistair Crooks <agc%pkgsrc.org@localhost>
+uid           Alistair Crooks <agc%netbsd.org@localhost>
+uid           Alistair Crooks <agc%netflix.com@localhost>
 
 EOF
        uudecode <<EOF
@@ -8643,14 +8627,12 @@
 EOF
        cat >expected34 <<EOF
 Good signature for det.sig made Thu Oct 18 02:12:33 2012
-signature  2048/RSA (Encrypt or Sign) 1b68dcfcc0596823 2004-01-12
-fingerprint:  d415 9deb 336d e4cc cdfa 00cd 1b68 dcfc c059 6823 
-uid              Alistair Crooks <agc%alistaircrooks.com@localhost>
-uid              Alistair Crooks <agc%pkgsrc.org@localhost>
-uid              Alistair Crooks <agc%netbsd.org@localhost>
-uid              Alistair Crooks <agc%netflix.com@localhost>
-encryption 2048/RSA (Encrypt or Sign) 79deb61e488eee74 2004-01-12
-fingerprint:  57c0 c1e6 bf71 8845 416b 9522 79de b61e 488e ee74 
+signature     2048/RSA (Encrypt or Sign) 1b68dcfcc0596823 2004-01-12
+fingerprint   d415 9deb 336d e4cc cdfa 00cd 1b68 dcfc c059 6823 
+uid           Alistair Crooks <agc%alistaircrooks.com@localhost>
+uid           Alistair Crooks <agc%pkgsrc.org@localhost>
+uid           Alistair Crooks <agc%netbsd.org@localhost>
+uid           Alistair Crooks <agc%netflix.com@localhost>
 
 EOF
        cat >expected35 <<EOF
@@ -8795,38 +8777,30 @@
 EOF
        cat > expected36 << EOF
 Good signature for in1.gpg made Mon Oct 22 04:45:41 2012
-signature  2048/DSA 263fe78562e2fc7e 2012-10-21
-fingerprint:  d2e5 07b6 5d59 33d3 9c8d a618 263f e785 62e2 fc7e 
-uid              David Armstrong (Test DSA key - do not use) <dsa%dsa.com@localhost>
-encryption 2048/Elgamal (Encrypt Only) 53d1f21240f293c6 2012-10-21 [Expiry 2014-10-21]
-fingerprint:  6a83 d4aa 791f d8af a967 5e44 53d1 f212 40f2 93c6 
+signature     2048/DSA 263fe78562e2fc7e 2012-10-21
+fingerprint   d2e5 07b6 5d59 33d3 9c8d a618 263f e785 62e2 fc7e 
+uid           David Armstrong (Test DSA key - do not use) <dsa%dsa.com@localhost>
 
 EOF
        cat >expected37 <<EOF
 Good signature for [stdin] made Mon Oct 22 04:45:41 2012
-signature  2048/DSA 263fe78562e2fc7e 2012-10-21
-fingerprint:  d2e5 07b6 5d59 33d3 9c8d a618 263f e785 62e2 fc7e 
-uid              David Armstrong (Test DSA key - do not use) <dsa%dsa.com@localhost>
-encryption 2048/Elgamal (Encrypt Only) 53d1f21240f293c6 2012-10-21 [Expiry 2014-10-21]
-fingerprint:  6a83 d4aa 791f d8af a967 5e44 53d1 f212 40f2 93c6 
+signature     2048/DSA 263fe78562e2fc7e 2012-10-21
+fingerprint   d2e5 07b6 5d59 33d3 9c8d a618 263f e785 62e2 fc7e 
+uid           David Armstrong (Test DSA key - do not use) <dsa%dsa.com@localhost>
 
 EOF
        cat >expected38 <<EOF
 Good signature for in1.asc made Mon Oct 22 04:45:26 2012
-signature  2048/DSA 263fe78562e2fc7e 2012-10-21
-fingerprint:  d2e5 07b6 5d59 33d3 9c8d a618 263f e785 62e2 fc7e 
-uid              David Armstrong (Test DSA key - do not use) <dsa%dsa.com@localhost>
-encryption 2048/Elgamal (Encrypt Only) 53d1f21240f293c6 2012-10-21 [Expiry 2014-10-21]
-fingerprint:  6a83 d4aa 791f d8af a967 5e44 53d1 f212 40f2 93c6 
+signature     2048/DSA 263fe78562e2fc7e 2012-10-21
+fingerprint   d2e5 07b6 5d59 33d3 9c8d a618 263f e785 62e2 fc7e 
+uid           David Armstrong (Test DSA key - do not use) <dsa%dsa.com@localhost>
 
 EOF
        cat >expected39 <<EOF
 Good signature for [stdin] made Mon Oct 22 04:45:26 2012
-signature  2048/DSA 263fe78562e2fc7e 2012-10-21
-fingerprint:  d2e5 07b6 5d59 33d3 9c8d a618 263f e785 62e2 fc7e 
-uid              David Armstrong (Test DSA key - do not use) <dsa%dsa.com@localhost>
-encryption 2048/Elgamal (Encrypt Only) 53d1f21240f293c6 2012-10-21 [Expiry 2014-10-21]
-fingerprint:  6a83 d4aa 791f d8af a967 5e44 53d1 f212 40f2 93c6 
+signature     2048/DSA 263fe78562e2fc7e 2012-10-21
+fingerprint   d2e5 07b6 5d59 33d3 9c8d a618 263f e785 62e2 fc7e 
+uid           David Armstrong (Test DSA key - do not use) <dsa%dsa.com@localhost>
 
 EOF
        cat >expected40 <<EOF
@@ -8863,20 +8837,16 @@
 EOF
        cat >expected44 <<EOF
 Good signature for in2.gpg made Mon Oct 22 06:24:09 2012
-signature  2048/DSA 263fe78562e2fc7e 2012-10-21
-fingerprint:  d2e5 07b6 5d59 33d3 9c8d a618 263f e785 62e2 fc7e 
-uid              David Armstrong (Test DSA key - do not use) <dsa%dsa.com@localhost>
-encryption 2048/Elgamal (Encrypt Only) 53d1f21240f293c6 2012-10-21 [Expiry 2014-10-21]
-fingerprint:  6a83 d4aa 791f d8af a967 5e44 53d1 f212 40f2 93c6 
+signature     2048/DSA 263fe78562e2fc7e 2012-10-21
+fingerprint   d2e5 07b6 5d59 33d3 9c8d a618 263f e785 62e2 fc7e 
+uid           David Armstrong (Test DSA key - do not use) <dsa%dsa.com@localhost>
 
 EOF
        cat >expected45 <<EOF
 Good signature for in2.asc made Mon Oct 22 06:24:26 2012
-signature  2048/DSA 263fe78562e2fc7e 2012-10-21
-fingerprint:  d2e5 07b6 5d59 33d3 9c8d a618 263f e785 62e2 fc7e 
-uid              David Armstrong (Test DSA key - do not use) <dsa%dsa.com@localhost>
-encryption 2048/Elgamal (Encrypt Only) 53d1f21240f293c6 2012-10-21 [Expiry 2014-10-21]
-fingerprint:  6a83 d4aa 791f d8af a967 5e44 53d1 f212 40f2 93c6 
+signature     2048/DSA 263fe78562e2fc7e 2012-10-21
+fingerprint   d2e5 07b6 5d59 33d3 9c8d a618 263f e785 62e2 fc7e 
+uid           David Armstrong (Test DSA key - do not use) <dsa%dsa.com@localhost>
 
 EOF
        cat >expected46 <<EOF
Prev by Date: [src/trunk]: src/sys/arch/arm/include Fix TPIDRPRW_IS_CURLWP builds.
Next by Date: [src/trunk]: src/sys/dev/ic Revert previous change to dwc_gmac_txintr() - whi...
Previous by Thread: [src/trunk]: src/sys/arch/arm/include Fix TPIDRPRW_IS_CURLWP builds.
Next by Thread: [src/trunk]: src/sys/dev/ic Revert previous change to dwc_gmac_txintr() - whi...
Indexes:
Home | Main Index | Thread Index | Old Index