Changeset 341

Timestamp:

01/30/06 13:08:26

Author:

ben

Message:

More decryption, missing file.

Files:

• openpgpsdk/trunk/examples/create-crypted-gpg-key.sh (added)
• openpgpsdk/trunk/include/openpgpsdk/crypto.h (modified) (3 diffs)
• openpgpsdk/trunk/include/openpgpsdk/packet-parse.h (modified) (1 diff)
• openpgpsdk/trunk/include/openpgpsdk/packet.h (modified) (1 diff)
• openpgpsdk/trunk/src/packet-parse.c (modified) (6 diffs)
• openpgpsdk/trunk/src/symmetric.c (added)

openpgpsdk/trunk/include/openpgpsdk/crypto.h

@@ -27 +27 @@
-    };
-
+typedef void ops_decrypt_set_iv_t(ops_decrypt_t *decrypt,
+                                  const unsigned char *iv);
+typedef void ops_decrypt_set_key_t(ops_decrypt_t *decrypt,
+                                   const unsigned char *key);
-typedef void ops_decrypt_init_t(ops_decrypt_t *decrypt);
-typedef size_t ops_decrypt_decrypt_t(ops_decrypt_t *decrypt,void *out,
@@ -35 +39 @@
-    {
-    ops_symmetric_algorithm_t algorithm;
+    size_t blocksize;
+    size_t keysize;
+    ops_decrypt_set_iv_t *set_iv; /* Call this before init! */
+    ops_decrypt_set_iv_t *set_key; /* Call this before init! */
-    ops_decrypt_init_t *init;
-    ops_decrypt_decrypt_t *decrypt;
-    ops_decrypt_finish_t *finish;
+    unsigned char iv[OPS_MAX_BLOCK_SIZE];
+    unsigned char civ[OPS_MAX_BLOCK_SIZE];
+    unsigned char key[OPS_MAX_KEY_SIZE];
+    int num;
-    void *data;
-    };
@@ -67 +79 @@
-int ops_decrypt_data(ops_region_t *region,ops_parse_info_t *parse_info);
-
-
-
+
+
+
+
+
-
-#endif

openpgpsdk/trunk/include/openpgpsdk/packet-parse.h

@@ -72 +72 @@
-void ops_reader_set(ops_parse_info_t *pinfo,ops_reader_t *reader,void *arg);
-void ops_reader_push(ops_parse_info_t *pinfo,ops_reader_t *reader,void *arg);
+void ops_reader_pop(ops_parse_info_t *pinfo);
-void *ops_reader_get_arg_from_pinfo(ops_parse_info_t *pinfo);
-

openpgpsdk/trunk/include/openpgpsdk/packet.h

@@ -415 +415 @@
-// Maximum block size for symmetric crypto
-#define OPS_MAX_BLOCK_SIZE      16
+
+// Maximum key size for symmetric crypto
+#define OPS_MAX_KEY_SIZE        32
-
-// Salt size for hashing

openpgpsdk/trunk/src/packet-parse.c

@@ -1789 +1789 @@
-    ops_parser_content_t content;
-    unsigned char c[1];
+    ops_decrypt_t decrypt;
+    int ret=1;
+    ops_region_t encregion;
+    ops_region_t *saved_region=NULL;
-
-    memset(&content,'\0',sizeof content);
@@ -1863 +1867 @@
-        ops_hash(hash,C.secret_key.hash_algorithm,passphrase,
-                 strlen(passphrase));
+
+        ops_decrypt_any(&decrypt,C.secret_key.algorithm);
+        decrypt.set_iv(&decrypt,C.secret_key.iv);
+        decrypt.set_key(&decrypt,hash);
+
+        ops_reader_push_decrypt(parse_info,&decrypt,region);
+
+        /* Since all known encryption for PGP doesn't compress, we can limit
+           to the same length as the current region (for now) */
+        ops_init_subregion(&encregion,NULL);
+        encregion.length=region->length-region->length_read;
+        saved_region=region;
+        region=&encregion;
-        }
-
@@ -1874 +1891 @@
-           || !limited_read_mpi(&C.secret_key.key.rsa.q,region,parse_info)
-           || !limited_read_mpi(&C.secret_key.key.rsa.u,region,parse_info))
-urn 
+=
-        break;
-
@@ -1880 +1897 @@
-    case OPS_PKA_DSA:
-        if(!limited_read_mpi(&C.secret_key.key.dsa.x,region,parse_info))
-urn 
+=
-        break;
-
@@ -1886 +1903 @@
-        fprintf(stderr,"Unexpected aglorithm: %d\n",
-                C.secret_key.public_key.algorithm);
+        ret=0;
-        assert(0);
-        }
+
+    if(saved_region)
+        {
+        ops_reader_pop_decrypt(parse_info);
+        region=saved_region;
+        }
+
+    if(!ret)
+        return 0;
-
-    if(!limited_read_scalar(&C.secret_key.checksum,2,region,parse_info))
@@ -2318 +2345 @@
-    }
-
+void ops_reader_pop(ops_parse_info_t *pinfo)
+    { 
+    ops_reader_info_t *next=pinfo->rinfo.next;
+
+    pinfo->rinfo=*next;
+    free(next);
+    }
+
-void *ops_reader_get_arg(ops_reader_info_t *rinfo)
-    { return rinfo->arg; }