[src/trunk]: src/crypto/external/bsd/netpgp/dist/src/lib make sure that the e...

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

details:   https://anonhg.NetBSD.org/src/rev/9ff45f13aacc
branches:  trunk
changeset: 752937:9ff45f13aacc
user:      agc <agc%NetBSD.org@localhost>
date:      Fri Mar 12 01:22:01 2010 +0000

description:
make sure that the expiration date and time are attached to the correct key

diffstat:

 crypto/external/bsd/netpgp/dist/src/lib/keyring.c |  6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diffs (23 lines):

diff -r 06ee2fbcb42c -r 9ff45f13aacc crypto/external/bsd/netpgp/dist/src/lib/keyring.c
--- a/crypto/external/bsd/netpgp/dist/src/lib/keyring.c Thu Mar 11 23:28:07 2010 +0000
+++ b/crypto/external/bsd/netpgp/dist/src/lib/keyring.c Fri Mar 12 01:22:01 2010 +0000
@@ -57,7 +57,7 @@
 
 #if defined(__NetBSD__)
 __COPYRIGHT("@(#) Copyright (c) 2009 The NetBSD Foundation, Inc. All rights reserved.");
-__RCSID("$NetBSD: keyring.c,v 1.31 2010/03/08 08:56:03 agc Exp $");
+__RCSID("$NetBSD: keyring.c,v 1.32 2010/03/12 01:22:01 agc Exp $");
 #endif
 
 #ifdef HAVE_FCNTL_H
@@ -610,7 +610,9 @@
                break;
        case OPS_PTAG_SS_KEY_EXPIRY:
                EXPAND_ARRAY(keyring, key);
-               keyring->keys[keyring->keyc].key.pubkey.duration = pkt->u.ss_time.time;
+               if (keyring->keyc > 0) {
+                       keyring->keys[keyring->keyc - 1].key.pubkey.duration = pkt->u.ss_time.time;
+               }
                break;
        default:
                break;