Changeset 438

Timestamp:

02/15/07 18:30:31

Author:

rachel

Message:

Ben's stub encryption code.
Libraries compile but encrypt.c is needed in examples directory.

Files:

• openpgpsdk/trunk/examples/Makefile.template (modified) (2 diffs)
• openpgpsdk/trunk/include/openpgpsdk/armour.h (modified) (1 diff)
• openpgpsdk/trunk/include/openpgpsdk/crypto.h (modified) (1 diff)
• openpgpsdk/trunk/src/advanced/adv_accumulate.c (modified) (2 diffs)
• openpgpsdk/trunk/src/advanced/adv_create.c (modified) (2 diffs)
• openpgpsdk/trunk/src/advanced/keyring_local.h (modified) (1 diff)
• openpgpsdk/trunk/src/standard/std_keyring.c (modified) (1 diff)
• openpgpsdk/trunk/src/standard/std_print.c (modified) (1 diff)

openpgpsdk/trunk/examples/Makefile.template

@@ -8 +8 @@
-LIBS=$(LIBDEPS) %CRYPTO_LIBS% %ZLIB% $(DM_LIB) %LIBS%
-EXES=packet-dump verify create-key verify2 sign-detached \
-
+ encrypt
-# create-signed-key 
-
@@ -46 +46 @@
-        $(CC) $(LDFLAGS) -o decrypt decrypt.o $(LIBS)
-
+encrypt: encrypt.o $(LIBDEPS)
+        $(CC) $(LDFLAGS) -o encrypt encrypt.o $(LIBS)
-
-tags:

openpgpsdk/trunk/include/openpgpsdk/armour.h

@@ -11 +11 @@
-                                  ops_create_signature_t *sig);
-void ops_writer_switch_to_signature(ops_create_info_t *info);
-

openpgpsdk/trunk/include/openpgpsdk/crypto.h

@@ -108 +108 @@
-                    const ops_secret_key_t *skey);
-
+// Encrypt everything that's written
+struct ops_key_data;
+void ops_writer_push_encrypt(ops_create_info_t *info,
+                             const struct ops_key_data *key);
+
-#endif

openpgpsdk/trunk/src/advanced/adv_accumulate.c

@@ -52 +52 @@
-               sizeof keyring->keys[keyring->nkeys]);
-
-
+_
-        ops_fingerprint(&keyring->keys[keyring->nkeys].fingerprint,pkey);
-
@@ -132 +132 @@
-
-    printf("Key ID: ");
-
+_
-
-    printf("\nFingerpint: ");

openpgpsdk/trunk/src/advanced/adv_create.c

@@ -3 +3 @@
-
-#include <openpgpsdk/create.h>
+#include <openpgpsdk/keyring.h>
+#include "keyring_local.h"
+#include <openpgpsdk/packet.h>
-#include <openpgpsdk/util.h>
-#include <string.h>
@@ -744 +747 @@
-                                     ops_writer_info_t *winfo)
-    { return ops_stacked_write(src,length,errors,winfo); }
+
+
+ops_pk_session_key_t *ops_create_pk_session_key(const ops_key_data_t *key)
+    {
+    ops_pk_session_key_t *session_key=ops_mallocz(sizeof *session_key);
+
+    session_key->version=OPS_PKSK_V3;
+    memcpy(session_key->key_id, key->key_id, sizeof session_key->key_id);
+    // XXX: finish filling in the structure
+    return session_key;
+    }
+
+// XXX: should these be common and just be called ops_crypt_*?
+typedef struct _ops_encrypt_t ops_encrypt_t;
+typedef void ops_encrypt_set_iv_t(ops_encrypt_t *encrypt,
+                                  const unsigned char *iv);
+typedef void ops_encrypt_init_t(ops_encrypt_t *encrypt);
+typedef void ops_encrypt_resync_t(ops_encrypt_t *encrypt);
+typedef void ops_encrypt_block_encrypt_t(ops_encrypt_t *encrypt,void *out,
+                                         const void *in);
+typedef void ops_encrypt_finish_t(ops_encrypt_t *encrypt);
+
+/** _ops_encrypt_t */
+struct _ops_encrypt_t
+    {
+    ops_symmetric_algorithm_t algorithm;
+    size_t blocksize;
+    size_t keysize;
+    //    ops_encrypt_set_iv_t *set_iv; /* Call this before init! */
+    ops_encrypt_set_iv_t *set_key; /* Call this before init! */
+    ops_encrypt_init_t *base_init; /* Once the key is set, call this */
+    ops_encrypt_resync_t *resync;
+    //    ops_decrypt_decrypt_t *decrypt;
+    ops_encrypt_block_encrypt_t *block_encrypt;
+    ops_encrypt_finish_t *finish;
+    unsigned char iv[OPS_MAX_BLOCK_SIZE];
+    unsigned char civ[OPS_MAX_BLOCK_SIZE];
+    unsigned char siv[OPS_MAX_BLOCK_SIZE]; /* Needed for weird v3 resync */
+    unsigned char key[OPS_MAX_KEY_SIZE];
+    size_t num;
+    void *data;
+    };
+
+typedef struct
+    {
+    ops_encrypt_t *encrypter;
+    } encrypted_arg_t;
+
+
+/* dummy function */
+
+#ifndef ATTRIBUTE_UNUSED
+#define ATTRIBUTE_UNUSED __attribute__ ((__unused__))
+#endif /* ATTRIBUTE_UNUSED */
+
+void ops_write_pk_session_key(ops_create_info_t *info ATTRIBUTE_UNUSED, ops_pk_session_key_t *session_key ATTRIBUTE_UNUSED)
+    {
+    /* \todo write ops_write_pk_session_key() */
+    assert(0);
+    }
+
+static ops_boolean_t encrypted_writer(const unsigned char *src ATTRIBUTE_UNUSED,
+                              unsigned length ATTRIBUTE_UNUSED,
+                              ops_error_t **errors ATTRIBUTE_UNUSED,
+                              ops_writer_info_t *winfo ATTRIBUTE_UNUSED
+                              )
+    {
+     /* \todo */
+    assert(0);
+    }
+
+static ops_boolean_t encrypted_finaliser(ops_error_t **errors ATTRIBUTE_UNUSED,
+                                           ops_writer_info_t *winfo ATTRIBUTE_UNUSED)
+    {
+    /* \todo */
+    assert(0);
+    }
+
+void encrypted_destroyer (ops_writer_info_t *winfo ATTRIBUTE_UNUSED)
+     
+    {
+    /* \todo */
+    assert(0);
+    }
+
+/* end of dummy code */
+
+void ops_writer_push_encrypt(ops_create_info_t *info,
+                             const ops_key_data_t *key)
+    {
+    ops_pk_session_key_t *session_key;
+    encrypted_arg_t *arg=ops_mallocz(sizeof *arg);
+
+    session_key=ops_create_pk_session_key(key);
+    ops_write_pk_session_key(info,session_key);
+
+    ops_write_ptag(OPS_PTAG_CT_SE_DATA,info);
+    ops_writer_push(info,encrypted_writer,encrypted_finaliser,
+                    encrypted_destroyer,arg);
+    }

openpgpsdk/trunk/src/advanced/keyring_local.h

@@ -26 +26 @@
-    DECLARE_ARRAY(ops_user_id_t,uids);
-    DECLARE_ARRAY(ops_packet_t,packets);
-
+_
-    ops_fingerprint_t fingerprint;
-    ops_content_tag_t type;

openpgpsdk/trunk/src/standard/std_keyring.c

@@ -165 +165 @@
-
-    for(n=0 ; n < keyring->nkeys ; ++n)
-
+_
-            return &keyring->keys[n];
-

openpgpsdk/trunk/src/standard/std_print.c

@@ -54 +54 @@
-    printf(" ");
-
-
+_
-    printf(" ");
-