Changeset 345

Timestamp:

01/30/06 16:33:42

Author:

ben

Message:

Actually, the checksum is encrypted, too.

Files:

• openpgpsdk/trunk/src/packet-parse.c (modified) (2 diffs)

openpgpsdk/trunk/src/packet-parse.c

@@ -1936 +1936 @@
-        decrypt.set_key(&decrypt,key);
-
-        /* We need to prevent the decrypter from reading the trailing
-           checksum */
-        region->length-=checksum_length;
-        ops_reader_push_decrypt(parse_info,&decrypt,region);
-
-        /* Since all known encryption for PGP doesn't compress, we can
-
-
+
-        */
-
@@ -1977 +1973 @@
-        }
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        {
-        ops_reader_pop_decrypt(parse_info);
-        assert(region->length_read == region->length);
-        region=saved_region;
-        /* put back checksum data */
-        region->length+=checksum_length;
-        }
-
-    if(!ret)
-        return 0;
-
-    // XXX: check the checksum
-
-    if(C.secret_key.s2k_usage == OPS_S2KU_ENCRYPTED_AND_HASHED)
-        {
-        if(!limited_read(C.secret_key.checkhash,20,region,parse_info))
-            return 0;
-        }
-    else
-        {
-        if(!limited_read_scalar(&C.secret_key.checksum,2,region,parse_info))
-            return 0;
-        }
-
-    CBP(parse_info,OPS_PTAG_CT_SECRET_KEY,&content);