Changeset 343

Timestamp:

01/30/06 16:10:43

Author:

ben

Message:

Working secret key decryption!

Files:

• openpgpsdk/trunk/examples/packet-dump.c (modified) (3 diffs)
• openpgpsdk/trunk/include/openpgpsdk/crypto.h (modified) (2 diffs)
• openpgpsdk/trunk/include/openpgpsdk/packet.h (modified) (2 diffs)
• openpgpsdk/trunk/src/packet-parse.c (modified) (7 diffs)
• openpgpsdk/trunk/src/signature.c (modified) (1 diff)
• openpgpsdk/trunk/src/symmetric.c (modified) (4 diffs)

openpgpsdk/trunk/examples/packet-dump.c

@@ -831 +831 @@
-        print_hexdump("Salt",content->secret_key.salt,
-                      sizeof content->secret_key.salt);
-Iterations: %d\n",content->secret_key.iterations
+Octet count: %d\n",content->secret_key.octet_count
-        print_hexdump("IV",content->secret_key.iv,
-                      ops_block_size(content->secret_key.algorithm));
@@ -838 +838 @@
-        if(content_->tag == OPS_PTAG_CT_ENCRYPTED_SECRET_KEY)
-            break;
-
-        printf("Checksum: %04x\n",content->secret_key.checksum);
-
-        switch(content->secret_key.public_key.algorithm)
@@ -857 +855 @@
-            assert(0);
-            }
+
+        if(content->secret_key.s2k_usage == OPS_S2KU_ENCRYPTED_AND_HASHED)
+            print_hexdump("Checkhash",content->secret_key.checkhash,
+                          OPS_CHECKHASH_SIZE);
+        else
+            printf("Checksum: %04x\n",content->secret_key.checksum);
+
-        break;
-

openpgpsdk/trunk/include/openpgpsdk/crypto.h

@@ -9 +9 @@
-#include "packet-parse.h"
-
-
+
+
-
-typedef void ops_hash_init_t(ops_hash_t *hash);
@@ -76 +77 @@
-
-unsigned ops_block_size(ops_symmetric_algorithm_t alg);
+unsigned ops_key_size(ops_symmetric_algorithm_t alg);
-
-int ops_decrypt_data(ops_region_t *region,ops_parse_info_t *parse_info);

openpgpsdk/trunk/include/openpgpsdk/packet.h

@@ -422 +422 @@
-#define OPS_SALT_SIZE           8
-
+// Hash size for secret key check
+#define OPS_CHECKHASH_SIZE      20
+
-/** ops_secret_key_t
- */
@@ -432 +435 @@
-    ops_hash_algorithm_t        hash_algorithm;
-    unsigned char               salt[OPS_SALT_SIZE];
-iterations
+octet_count
-    unsigned char               iv[OPS_MAX_BLOCK_SIZE];
+    ops_secret_key_union_t      key;
-    unsigned                    checksum;
-ops_secret_key_union_t     key
+unsigned char              checkhash[OPS_CHECKHASH_SIZE]
-    } ops_secret_key_t;
-

openpgpsdk/trunk/src/packet-parse.c

@@ -1793 +1793 @@
-    ops_region_t encregion;
-    ops_region_t *saved_region=NULL;
+    size_t checksum_length=2;
-
-    memset(&content,'\0',sizeof content);
@@ -1800 +1801 @@
-        return 0;
-    C.secret_key.s2k_usage=c[0];
+
+    if(C.secret_key.s2k_usage == OPS_S2KU_ENCRYPTED_AND_HASHED)
+        checksum_length=20;
-
-    if(C.secret_key.s2k_usage == OPS_S2KU_ENCRYPTED
@@ -1828 +1832 @@
-            if(!limited_read(c,1,region,parse_info))
-                return 0;
-iterations
+octet_count
-            }
-        }
@@ -1846 +1850 @@
-        ops_parser_content_t pc;
-        char *passphrase;
-
+
+
+
+
+
-
-        n=ops_block_size(C.secret_key.algorithm);
@@ -1867 +1875 @@
-            }
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-        ops_decrypt_any(&decrypt,C.secret_key.algorithm);
-        decrypt.set_iv(&decrypt,C.secret_key.iv);
-
-
+
+
+
+
+
-        ops_reader_push_decrypt(parse_info,&decrypt,region);
-
-
-
+
+
+
+
+
-        ops_init_subregion(&encregion,NULL);
-        encregion.length=region->length-region->length_read;
@@ -1912 +1978 @@
-        {
-        ops_reader_pop_decrypt(parse_info);
+        assert(region->length_read == region->length);
-        region=saved_region;
+        /* put back checksum data */
+        region->length+=checksum_length;
-        }
-
@@ -1918 +1987 @@
-        return 0;
-
-    if(!limited_read_scalar(&C.secret_key.checksum,2,region,parse_info))
-        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);

openpgpsdk/trunk/src/signature.c

@@ -218 +218 @@
-    {
-    int n;
-
+_SIZE
-
-    n=hash->finish(hash,hashout);

openpgpsdk/trunk/src/symmetric.c

@@ -4 +4 @@
-#include <openssl/cast.h>
-
-unsigned ops_block_size(ops_symmetric_algorithm_t alg)
-    {
-    // perhaps do this via the underlying algorithm later
-    switch(alg)
-        {
-    case OPS_SA_PLAINTEXT:
-        return 1;
-
-    case OPS_SA_IDEA:
-    case OPS_SA_TRIPLEDES:
-    case OPS_SA_CAST5:
-    case OPS_SA_BLOWFISH:
-    case OPS_SA_TWOFISH:
-        return 8;
-
-    case OPS_SA_AES_128:
-    case OPS_SA_AES_192:
-    case OPS_SA_AES_256:
-        return 16;
-        }
-
-    return 0;
-    }
-
-typedef struct
-    {
-    unsigned char decrypted[1024];
-    size_t decrypted_count;
+    size_t decrypted_offset;
-    ops_decrypt_t *decrypt;
-    ops_region_t *region;
@@ -59 +36 @@
-                n=length;
-
-
++arg->decrypted_offset
-            arg->decrypted_count-=n;
+            arg->decrypted_offset+=n;
-            length-=n;
-            dest+=n;
@@ -89 +67 @@
-                                                       buffer,n);
-            assert(arg->decrypted_count > 0);
+
+            arg->decrypted_offset=0;
-            }
-        }
@@ -174 +154 @@
-    };
-
-void ops_decrypt_any(ops_decrypt_t *decrypt,
+static ops_decrypt_t *get_proto(
-    {
-    switch(alg)
-        {
-    case OPS_SA_CAST5:
-
-
+
-
-    default:
-        assert(0);
-        }
+
+    return NULL;
-    }
-
+void ops_decrypt_any(ops_decrypt_t *decrypt,ops_symmetric_algorithm_t alg)
+    { *decrypt=*get_proto(alg); }
+
+unsigned ops_block_size(ops_symmetric_algorithm_t alg)
+    {
+    ops_decrypt_t *p=get_proto(alg);
+
+    if(!p)
+        return 0;
+
+    return p->blocksize;
+    }
+
+unsigned ops_key_size(ops_symmetric_algorithm_t alg)
+    {
+    ops_decrypt_t *p=get_proto(alg);
+
+    if(!p)
+        return 0;
+
+    return p->keysize;
+    }