[src/trunk]: src/crypto/external/bsd/netpgp/dist/src/lib Fix signing of in-me...

[agc <agc%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/59a7536cabdb
branches:  trunk
changeset: 813634:59a7536cabdb
user:      agc <agc%NetBSD.org@localhost>
date:      Sun Feb 07 05:03:36 2016 +0000

description:
Fix signing of in-memory data with SSH keys

diffstat:

 crypto/external/bsd/netpgp/dist/src/lib/netpgp.c |  17 ++++++++++++-----
 1 files changed, 12 insertions(+), 5 deletions(-)

diffs (34 lines):

diff -r e92f21b1b390 -r 59a7536cabdb crypto/external/bsd/netpgp/dist/src/lib/netpgp.c
--- a/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c  Sat Feb 06 22:48:07 2016 +0000
+++ b/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c  Sun Feb 07 05:03:36 2016 +0000
@@ -34,7 +34,7 @@
 
 #if defined(__NetBSD__)
 __COPYRIGHT("@(#) Copyright (c) 2009 The NetBSD Foundation, Inc. All rights reserved.");
-__RCSID("$NetBSD: netpgp.c,v 1.96 2012/02/22 06:58:54 agc Exp $");
+__RCSID("$NetBSD: netpgp.c,v 1.97 2016/02/07 05:03:36 agc Exp $");
 #endif
 
 #include <sys/types.h>
@@ -1501,10 +1501,17 @@
                                        &pubkey->key.pubkey, 0);
                        }
                }
-               /* now decrypt key */
-               seckey = pgp_decrypt_seckey(keypair, netpgp->passfp);
-               if (seckey == NULL) {
-                       (void) fprintf(io->errs, "Bad passphrase\n");
+               if (netpgp_getvar(netpgp, "ssh keys") == NULL) {
+                       /* now decrypt key */
+                       seckey = pgp_decrypt_seckey(keypair, netpgp->passfp);
+                       if (seckey == NULL) {
+                               (void) fprintf(io->errs, "Bad passphrase\n");
+                       }
+               } else {
+                       pgp_keyring_t   *secring;
+
+                       secring = netpgp->secring;
+                       seckey = &secring->keys[0].key.seckey;
                }
        }
        if (seckey == NULL) {