Changeset 342

Timestamp:

01/30/06 13:36:42

Author:

ben

Message:

Give callbacks a preview of secret keys.

Files:

• openpgpsdk/trunk/examples/packet-dump.c (modified) (1 diff)
• openpgpsdk/trunk/src/packet-parse.c (modified) (2 diffs)

openpgpsdk/trunk/examples/packet-dump.c

@@ -834 +834 @@
-        print_hexdump("IV",content->secret_key.iv,
-                      ops_block_size(content->secret_key.algorithm));
+
+        /* no more set if encrypted */
+        if(content_->tag == OPS_PTAG_CT_ENCRYPTED_SECRET_KEY)
+            break;
+
-        printf("Checksum: %04x\n",content->secret_key.checksum);
-

openpgpsdk/trunk/src/packet-parse.c

@@ -1854 +1854 @@
-            return 0;
-
+        /* Let callbacks see what they're about to be passphrased for */
+        CBP(parse_info,OPS_PTAG_CT_ENCRYPTED_SECRET_KEY,&content);
+
-        passphrase=NULL;
-        pc.content.passphrase=&passphrase;
@@ -1861 +1864 @@
-            if(!consume_packet(region,parse_info,ops_false))
-               return 0;
-            CBP(parse_info,OPS_PTAG_CT_ENCRYPTED_SECRET_KEY,&content);
-            return 1;
-            }