CVS commit: src/crypto/external/bsd/netpgp/dist/src/netpgpkeys

["Alistair G. Crooks" <agc%netbsd.org@localhost>]

Module Name:    src
Committed By:   agc
Date:           Wed Sep  1 06:18:21 UTC 2010

Modified Files:
        src/crypto/external/bsd/netpgp/dist/src/netpgpkeys: netpgpkeys.c

Log Message:
+ if we're going to the trouble of testing the return value from the
setoption() function, probably best to return one

+ check for a valid entry in the JSON array instead of trusting that
we have one

+ if there is no JSON value to print, don't print it

+ if we've set the keyring from an ssh key file, then we're using ssh
keys - no need to set that value separately. This means that

        % netpgpkeys --sshkeyfile ~/.ssh/id_test.pub -l
        1 key found
        signature  2048/RSA (Encrypt or Sign) 8368881b3b9832ec 2010-08-26
        Key fingerprint: 3abd bf38 33a5 1f87 d704 ad42 8368 881b 3b98 32ec
        uid              osx-vm1.crowthorne.alistaircrooks.co.uk 
(/home/agc/.ssh/id_test.pub) 
<agc%osx-vm1.crowthorne.alistaircrooks.co.uk@localhost>

        %

lists ssh pubkeys properly, no need for other tautological arguments


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 \
    src/crypto/external/bsd/netpgp/dist/src/netpgpkeys/netpgpkeys.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.