aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--g10/ChangeLog5
-rw-r--r--g10/getkey.c1
2 files changed, 6 insertions, 0 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog
index 92afd0339..b38ebe2fb 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,3 +1,8 @@
+2005-02-04 David Shaw <[email protected]>
+
+ * getkey.c (merge_selfsigs_subkey): Merged away definition from
+ the backsigs code.
+
2005-01-31 David Shaw <[email protected]>
* keygen.c (do_generate_keypair): Write the auth key to the card
diff --git a/g10/getkey.c b/g10/getkey.c
index 824c9bb7a..789b540a1 100644
--- a/g10/getkey.c
+++ b/g10/getkey.c
@@ -1994,6 +1994,7 @@ merge_selfsigs_subkey( KBNODE keyblock, KBNODE subnode )
if(subpk->backsig==0)
{
int seq=0;
+ size_t n;
while((p=enum_sig_subpkt(sig->hashed,
SIGSUBPKT_SIGNATURE,&n,&seq,NULL)))