Module Name: src
Committed By: agc
Date: Fri Mar 12 01:22:01 UTC 2010
Modified Files:
src/crypto/external/bsd/netpgp/dist/src/lib: keyring.c
Log Message:
make sure that the expiration date and time are attached to the correct key
To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 \
src/crypto/external/bsd/netpgp/dist/src/lib/keyring.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/netpgp/dist/src/lib/keyring.c
diff -u src/crypto/external/bsd/netpgp/dist/src/lib/keyring.c:1.31 src/crypto/external/bsd/netpgp/dist/src/lib/keyring.c:1.32
--- src/crypto/external/bsd/netpgp/dist/src/lib/keyring.c:1.31 Mon Mar 8 08:56:03 2010
+++ src/crypto/external/bsd/netpgp/dist/src/lib/keyring.c Fri Mar 12 01:22:01 2010
@@ -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;
