* keyserver.c (keyserver_spawn): Write the 16-digit keyid rather than
authorDavid Shaw <dshaw@jabberwocky.com>
Fri, 6 Oct 2006 05:46:07 +0000 (05:46 +0000)
committerDavid Shaw <dshaw@jabberwocky.com>
Fri, 6 Oct 2006 05:46:07 +0000 (05:46 +0000)
whatever key selector the user used on the command line.

g10/ChangeLog
g10/keyserver.c

index 29bcfc6..9b83499 100644 (file)
@@ -1,3 +1,8 @@
+2006-10-06  David Shaw  <dshaw@jabberwocky.com>
+
+       * keyserver.c (keyserver_spawn): Write the 16-digit keyid rather
+       than whatever key selector the user used on the command line.
+
 2006-10-02  Werner Koch  <wk@g10code.com>
 
        * encr-data.c (decrypt_data, mdc_decode_filter): Check the MDC
        (verify_chv3): Removed the CHV status reread logic because we
        won't cache the C4 DO anymore.
 
-2005-01-21  David Shaw  <dshaw@grover.jabberwocky.com>
+2005-01-21  David Shaw  <dshaw@jabberwocky.com>
 
        * keyserver.c (free_keyserver_spec): Fix small leak.
        (keyserver_typemap): Map https if we are supporting it.
index a0893f1..939bcea 100644 (file)
@@ -1313,10 +1313,14 @@ keyserver_spawn(enum ks_action action,STRLIST list,KEYDB_SEARCH_DESC *desc,
                        (ulong)block->pkt->pkt.public_key->keyid[0],
                        (ulong)block->pkt->pkt.public_key->keyid[1]);
 
-               fprintf(spawn->tochild,"KEY %s BEGIN\n",key->d);
+               fprintf(spawn->tochild,"KEY %08lX%08lX BEGIN\n",
+                       (ulong)block->pkt->pkt.public_key->keyid[0],
+                       (ulong)block->pkt->pkt.public_key->keyid[1]);
                fwrite(iobuf_get_temp_buffer(buffer),
                       iobuf_get_temp_length(buffer),1,spawn->tochild);
-               fprintf(spawn->tochild,"KEY %s END\n",key->d);
+               fprintf(spawn->tochild,"KEY %08lX%08lX END\n",
+                       (ulong)block->pkt->pkt.public_key->keyid[0],
+                       (ulong)block->pkt->pkt.public_key->keyid[1]);
 
                iobuf_close(buffer);