Changeset 470

Timestamp:

04/22/07 17:05:42

Author:

ben

Message:

Untested, non-functional, partial encryption implementation.

Files:

• openpgpsdk/trunk/examples/Makefile.template (modified) (2 diffs)
• openpgpsdk/trunk/include/openpgpsdk/crypto.h (modified) (4 diffs)
• openpgpsdk/trunk/include/openpgpsdk/packet-parse.h (modified) (1 diff)
• openpgpsdk/trunk/include/openpgpsdk/random.h (added)
• openpgpsdk/trunk/include/openpgpsdk/types.h (modified) (1 diff)
• openpgpsdk/trunk/src/advanced/Makefile.template (modified) (1 diff)
• openpgpsdk/trunk/src/advanced/adv_create.c (modified) (5 diffs)
• openpgpsdk/trunk/src/advanced/adv_crypto.c (modified) (3 diffs)
• openpgpsdk/trunk/src/advanced/adv_openssl_crypto.c (modified) (1 diff)
• openpgpsdk/trunk/src/advanced/adv_packet-parse.c (modified) (6 diffs)
• openpgpsdk/trunk/src/advanced/adv_symmetric.c (modified) (16 diffs)
• openpgpsdk/trunk/src/advanced/parse_local.h (modified) (1 diff)
• openpgpsdk/trunk/src/advanced/random.c (added)
• openpgpsdk/trunk/tests/Makefile.template (modified) (1 diff)

openpgpsdk/trunk/examples/Makefile.template

@@ -14 +14 @@
-
-test: test-dump test-verify test-verify-armoured test-create-key \
-
+ test-encrypt
-
-../src/standard/libops_std.a::
@@ -112 +112 @@
-        ./packet-dump -p ../test/v3-secring.pgp
-
+$(SCRATCH)/t1.sec $(SCRATCH)/t1.pub:
+        ./create-gpg-key.sh
+
+test-encrypt: encrypt $(SCRATCH)/t1.pub
+        echo 'Test encryption' | ./encrypt $(SCRATCH)/t1.pub "OPS Test (This is a test) <ops@links.org>" > $(SCRATCH)/encrypted
+        gpg --no-default-keyring --secret-keyring $(SCRATCH)/t1.sec $(SCRATCH)/encrypted
+
-include .depend

openpgpsdk/trunk/include/openpgpsdk/crypto.h

@@ -28 +28 @@
-    };
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-/** _ops_decrypt_t */
-de
+
-    {
-    ops_symmetric_algorithm_t algorithm;
-    size_t blocksize;
-    size_t keysize;
-
-
-
-
-
-
-
+
+
+
+
+
+
-    unsigned char iv[OPS_MAX_BLOCK_SIZE];
-    unsigned char civ[OPS_MAX_BLOCK_SIZE];
@@ -79 +76 @@
-int ops_rsa_public_decrypt(unsigned char *out,const unsigned char *in,
-                           size_t length,const ops_rsa_public_key_t *rsa);
+int ops_rsa_public_encrypt(unsigned char *out,const unsigned char *in,
+                           size_t length,const ops_rsa_public_key_t *rsa);
-int ops_rsa_private_encrypt(unsigned char *out,const unsigned char *in,
-                            size_t length,const ops_rsa_secret_key_t *srsa,
@@ -92 +91 @@
-                     ops_parse_info_t *parse_info);
-
-
-
-
-
+
+
+
+
+
+
-
-de
+
-                             ops_region_t *region);
-void ops_reader_pop_decrypt(ops_parse_info_t *pinfo);
@@ -107 +108 @@
-int ops_decrypt_mpi(unsigned char *buf,unsigned buflen,const BIGNUM *encmpi,
-                    const ops_secret_key_t *skey);
+ops_boolean_t ops_encrypt_mpi(const unsigned char *buf, size_t buflen,
+                              const ops_public_key_t *pkey,
+                              ops_pk_session_key_parameters_t *spk);
+
-
-// Encrypt everything that's written

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

@@ -94 +94 @@
-void ops_parse_info_delete(ops_parse_info_t *pinfo);
-ops_error_t *ops_parse_info_get_errors(ops_parse_info_t *pinfo);
-de
+
-
-void ops_parse_cb_set(ops_parse_info_t *pinfo,ops_parse_cb_t *cb,void *arg);

openpgpsdk/trunk/include/openpgpsdk/types.h

@@ -25 +25 @@
-typedef enum ops_content_tag_t ops_content_tag_t;
-
-decrypt_t ops_de
+crypt_t ops_
-
-/** ops_hash_t */

openpgpsdk/trunk/src/advanced/Makefile.template

@@ -13 +13 @@
-        adv_signature.o adv_compress.o adv_packet-show.o adv_create.o \
-        adv_validate.o adv_lists.o adv_armour.o adv_errors.o \
-
+ random.o
-
-headers:

openpgpsdk/trunk/src/advanced/adv_create.c

@@ -4 +4 @@
-#include <openpgpsdk/create.h>
-#include <openpgpsdk/keyring.h>
+#include <openpgpsdk/random.h>
-#include "keyring_local.h"
-#include <openpgpsdk/packet.h>
@@ -669 +670 @@
-    // Make sure the finaliser has been called.
-    assert(!info->winfo.finaliser);
-w
+
-    assert(info->winfo.next);
-    if(info->winfo.destroyer)
@@ -752 +753 @@
-    ops_pk_session_key_t *session_key=ops_mallocz(sizeof *session_key);
-
+    assert(key->type == OPS_PTAG_CT_PUBLIC_KEY);
-    session_key->version=OPS_PKSK_V3;
-    memcpy(session_key->key_id, key->key_id, sizeof session_key->key_id);
-
+
+
+
+
+
+
+
+
+
-    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
-    {
-en
+
-    } encrypted_arg_t;
-
-
-/* dummy function */
-
-#ifndef ATTRIBUTE_UNUSED
@@ -801 +777 @@
-#endif /* ATTRIBUTE_UNUSED */
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    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);
-
-    return ops_false;
@@ -820 +803 @@
-
-static ops_boolean_t encrypted_finaliser(ops_error_t **errors ATTRIBUTE_UNUSED,
-  
+
-    {
-    /* \todo */

openpgpsdk/trunk/src/advanced/adv_crypto.c

@@ -1 +1 @@
-#include <openpgpsdk/crypto.h>
+#include <openpgpsdk/random.h>
-
-#include <assert.h>
@@ -28 +29 @@
-        return -1;
-
-       
+    
-    printf(" decrypt=%d ",n);
-    hexdump(mpibuf,n);
-    printf("\n");
-       
+    
-
-    // Decode EME-PKCS1_V1_5 (RFC 2437).
@@ -54 +55 @@
-    return n-i;
-    }
+
+ops_boolean_t ops_encrypt_mpi(const unsigned char *buf, size_t buflen,
+                              const ops_public_key_t *pkey,
+                              ops_pk_session_key_parameters_t *skp)
+    {
+    unsigned char encmpibuf[8192];
+    unsigned char padded[8192];
+    int n;
+    unsigned i;
+
+    assert(pkey->algorithm == OPS_PKA_RSA);
+
+    n=BN_num_bytes(pkey->key.rsa.n);
+    padded[0]=0;
+    padded[1]=2;
+    // add non-zero random bytes
+    for(i=2 ; i < n-buflen-1 ; ++i)
+        do
+            ops_random(padded+i, 1);
+        while(padded[i] == 0);
+    padded[i++]=0;
+    memcpy(padded+i, buf, buflen);
+    
+    n=ops_rsa_public_encrypt(encmpibuf, padded, n, &pkey->key.rsa);
+
+    if(n <= 0)
+        return ops_false;
+
+    skp->rsa.encrypted_m=BN_bin2bn(encmpibuf, n, NULL);
+
+    return ops_true;
+    }

openpgpsdk/trunk/src/advanced/adv_openssl_crypto.c

@@ -173 +173 @@
-    }
-
+int ops_rsa_public_encrypt(unsigned char *out,const unsigned char *in,
+                           size_t length,const ops_rsa_public_key_t *rsa)
+    {
+    RSA *orsa;
+    int n;
+
+    orsa=RSA_new();
+    orsa->n=rsa->n;
+    orsa->e=rsa->e;
+
+    n=RSA_public_encrypt(length,in,out,orsa,RSA_NO_PADDING);
+
+    orsa->n=orsa->e=NULL;
+    RSA_free(orsa);
+
+    return n;
+    }
+
-void ops_crypto_init()
-    {

openpgpsdk/trunk/src/advanced/adv_packet-parse.c

@@ -1888 +1888 @@
-    ops_parser_content_t content;
-    unsigned char c[1];
-de
+
-    int ret=1;
-    ops_region_t encregion;
@@ -2041 +2041 @@
-        free(passphrase);
-
-de
+
-        decrypt.set_iv(&decrypt,C.secret_key.iv);
-        decrypt.set_key(&decrypt,key);
@@ -2238 +2238 @@
-    CBP(pinfo,OPS_PTAG_CT_PK_SESSION_KEY,&content);
-
-de
+
-    pinfo->decrypt.set_key(&pinfo->decrypt,C.pk_session_key.key);
-
@@ -2249 +2249 @@
-    {
-    int r=1;
-de
+
-
-    if(decrypt)
@@ -2276 +2276 @@
-        if(tag == OPS_PTAG_CT_SE_DATA_BODY)
-            {
-
+decrypt_
-            decrypt->block_encrypt(decrypt,decrypt->civ,decrypt->civ);
-            }
@@ -2752 +2752 @@
-    { return pinfo->errors; }
-
-de
+
-    {
-    if(pinfo->decrypt.algorithm)

openpgpsdk/trunk/src/advanced/adv_symmetric.c

@@ -17 +17 @@
-    size_t decrypted_count;
-    size_t decrypted_offset;
-de
+
-    ops_region_t *region;
-    ops_boolean_t prev_read_was_plain:1;
@@ -33 +33 @@
-        {
-        assert(rinfo->pinfo->reading_v3_secret);
-
+decrypt_
-        arg->prev_read_was_plain=ops_false;
-        }
@@ -94 +94 @@
-            if(!rinfo->pinfo->reading_v3_secret
-               || !rinfo->pinfo->reading_mpi_length)
-_decrypt
-       
-       
+
+
+
-            else
-                {
@@ -115 +115 @@
-    { free(ops_reader_get_arg(rinfo)); }
-
-de
+
-                             ops_region_t *region)
-    {
@@ -132 +132 @@
-    encrypted_arg_t *arg=ops_reader_get_arg(ops_parse_get_rinfo(pinfo));
-
-
+decrypt_
-    free(arg);
-    
@@ -138 +138 @@
-    }
-
-decrypt_t *de
-decrypt->iv,iv,de
-
-decrypt_t *de
-decrypt->key,key,de
-
-de
+crypt_t *
+crypt->iv,iv,
+
+crypt_t *
+crypt->key,key,
+
+
-    {
-    if(decrypt->num == decrypt->blocksize)
@@ -156 +156 @@
-    }
-
-decrypt_t *de
-
-de
-de
-
-
-decrypt_t *de
-
-de
-de
-decrypt->data,decrypt->keysize,de
-
-
-decrypt_t *de
-de
+crypt_t *
+
+
+
+
+
+crypt_t *
+
+
+
+crypt->data,crypt->keysize,
+
+
+crypt_t *
+
-
-#define TRAILER         "","","","",0,NULL
-
-de
+
-    {
-    OPS_SA_CAST5,
@@ -189 +189 @@
-
-#ifndef OPENSSL_NO_IDEA
-decrypt_t *de
-
-de
-
-de
-de
-
-
-decrypt->key,de
-
-
-decrypt_t *de
-de
-
-de
+crypt_t *
+
+
+
+
+
+
+when decrypting 
+crypt->key,
+
+
+crypt_t *
+
+
+
-    {
-    OPS_SA_IDEA,
@@ -218 +218 @@
-#endif /* OPENSSL_NO_IDEA */
-
-decrypt_t *de
-
-de
-de
-decrypt->key,256,de
-
-
-decrypt_t *de
-de
-
-de
+crypt_t *
+
+
+
+crypt->key,256,
+
+
+crypt_t *
+
+
+
-    {
-    OPS_SA_AES_256,
@@ -242 +242 @@
-    };
-
-decrypt_t *de
+crypt_t *
-    {
-    DES_key_schedule *keys;
-    int n;
-
-de
-de
+
+
-
-    for(n=0 ; n < 3 ; ++n)
-de
-
-
-decrypt_t *de
+
+
+
+crypt_t *
-                                    const void *in)
-    {
-de
+
-
-    DES_ecb3_encrypt((void *)in,out,&keys[0],&keys[1],&keys[2],1);
-    }
-
-de
+
-    {
-    OPS_SA_TRIPLEDES,
@@ -276 +276 @@
-    };
-
-de
+
-    {
-    switch(alg)
@@ -303 +303 @@
-    }
-
-decrypt_any(ops_decrypt_t *de
-de
+crypt_any(ops_crypt_t *
+
-
-unsigned ops_block_size(ops_symmetric_algorithm_t alg)
-    {
-de
+
-
-    if(!p)
@@ -318 +318 @@
-unsigned ops_key_size(ops_symmetric_algorithm_t alg)
-    {
-de
+
-
-    if(!p)
@@ -326 +326 @@
-    }
-
-de
+
-    {
-    decrypt->base_init(decrypt);
@@ -334 +334 @@
-    }
-
-_decrypt(ops_de
-       
+(ops_
+
-    {
-    unsigned char *out=out_;
@@ -359 +359 @@
-    return saved;
-    }
+
+size_t ops_encrypt(ops_crypt_t *decrypt,void *out_,const void *in_,
+                   size_t count)
+    {
+    unsigned char *out=out_;
+    const unsigned char *in=in_;
+    int saved=count;
+
+    /* in order to support v3's weird resyncing we have to implement CFB mode
+       ourselves */
+    while(count-- > 0)
+        {
+        if(decrypt->num == decrypt->blocksize)
+            {
+            memcpy(decrypt->siv,decrypt->civ,decrypt->blocksize);
+            decrypt->block_encrypt(decrypt,decrypt->civ,decrypt->civ);
+            decrypt->num=0;
+            }
+        decrypt->civ[decrypt->num]=*out++=decrypt->civ[decrypt->num]^*in++;
+        ++decrypt->num;
+        }
+
+    return saved;
+    }

openpgpsdk/trunk/src/advanced/parse_local.h

@@ -69 +69 @@
-    ops_parse_cb_info_t cbinfo;
-    ops_error_t *errors;
-de
+
-    size_t nhashes;
-    ops_parse_hash_info_t *hashes;

openpgpsdk/trunk/tests/Makefile.template

@@ -26 +26 @@
-$(CUNIT_LIB):
-        tar xvfz CUnit-2.1-0-src.tar.gz
-; ./configure --prefix $(PWD)/../; make;
+ && ./configure --prefix $(PWD)/../ && make &&
-
-clean: