Changeset 489

Timestamp:

08/20/07 17:19:16

Author:

rachel

Message:

MDC hash now working.

Files:

• openpgpsdk/trunk/include/openpgpsdk/create.h (modified) (2 diffs)
• openpgpsdk/trunk/src/advanced/adv_create.c (modified) (6 diffs)
• openpgpsdk/trunk/src/advanced/adv_crypto.c (modified) (4 diffs)
• openpgpsdk/trunk/src/advanced/adv_openssl_crypto.c (modified) (1 diff)
• openpgpsdk/trunk/src/advanced/adv_packet-parse.c (modified) (10 diffs)
• openpgpsdk/trunk/tests/test_packet_types.c (modified) (4 diffs)
• openpgpsdk/trunk/tests/test_rsa_decrypt.c (modified) (4 diffs)

openpgpsdk/trunk/include/openpgpsdk/create.h

@@ -101 +101 @@
-                                                     ops_create_info_t *info);
-
-
-
+
-                                                        ops_create_info_t *info);
-
@@ -111 +110 @@
-ops_boolean_t ops_write_pk_session_key(ops_create_info_t *info,
-                                       ops_pk_session_key_t *pksk);
+void ops_calc_session_key_checksum(ops_pk_session_key_t *session_key, unsigned char *cs);
+void ops_calc_mdc_hash(const unsigned char* preamble, const size_t sz_preamble, const unsigned char* data, const unsigned int len, unsigned char *hashed);
-
-#endif

openpgpsdk/trunk/src/advanced/adv_create.c

@@ -753 +753 @@
-    { return ops_stacked_write(src,length,errors,winfo); }
-
-
+
+
-    {
-    int i=0;
-    unsigned long checksum=0;
+
+    assert(session_key->symmetric_algorithm==OPS_SA_CAST5);
+    for (i=0; i<CAST_KEY_LENGTH; i++)
+        {
+        checksum+=session_key->key[i];
+        }
+    checksum = checksum % 65536;
+
+    fprintf(stderr,"\nm buf checksum: ");
+    cs[0]=checksum >> 8;
+    fprintf(stderr," %2x",cs[0]);
+    cs[1]=checksum & 0xFF;
+    fprintf(stderr," %2x\n",cs[1]);
+    }    
+
+static void create_unencoded_m_buf(ops_pk_session_key_t *session_key, unsigned char *m_buf)
+    {
+    int i=0;
+    //    unsigned long checksum=0;
-
-    // m_buf is the buffer which will be encoded in PKCS#1 block
@@ -764 +784 @@
-
-    m_buf[0]=session_key->symmetric_algorithm;
+
-    assert(session_key->symmetric_algorithm==OPS_SA_CAST5);
-
-    for (i=0; i<CAST_KEY_LENGTH; i++)
-        {
-        checksum+=session_key->key[i];
-        m_buf[1+i]=session_key->key[i];
-        }
-
-
-
-
+
+
-    }
-
@@ -851 +868 @@
-    session_key->version=OPS_PKSK_V3;
-    memcpy(session_key->key_id, key->key_id, sizeof session_key->key_id);
+
-    /*
-    fprintf(stderr,"Encrypting for RSA key id : ");
@@ -978 +996 @@
-/* end of dummy code */
-
-
-
+
-                            ops_create_info_t* info)
-    {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-    return ops_write_ptag(OPS_PTAG_CT_MDC, info)
-        && ops_write_length(OPS_SHA1_HASH_SIZE,info)
-        && ops_write(hashed, OPS_SHA1_HASH_SIZE, info);
+    }
+
+void ops_calc_mdc_hash(const unsigned char* preamble, const size_t sz_preamble, const unsigned char* data, const unsigned int len, unsigned char *hashed)
+    {
+    ops_hash_t hash;
+    //    unsigned char hashed[SHA_DIGEST_LENGTH];
+    unsigned char c[0];
+
+    // init
+    ops_hash_any(&hash, OPS_HASH_SHA1);
+    hash.init(&hash);
+
+    // preamble
+    hash.add(&hash,preamble,sz_preamble);
+    // plaintext
+    hash.add(&hash,data,len); 
+    // MDC packet tag
+    c[0]=0xD3;
+    hash.add(&hash,&c[0],1);   
+    // MDC packet len
+    c[0]=0x14;
+    hash.add(&hash,&c[0],1);   
+
+    //finish
+    hash.finish(&hash,hashed);
-    }
-
@@ -1007 +1035 @@
-                                   ops_create_info_t *info)
-    {
+    unsigned char hashed[SHA_DIGEST_LENGTH];
-    const size_t sz_mdc=1+1+SHA_DIGEST_LENGTH;
-    encrypted_arg_t *arg=ops_mallocz(sizeof *arg);
@@ -1032 +1061 @@
-
-    ops_setup_memory_write(&cinfo_mdc, &mem_mdc,sz_mdc);
-
+
+
+
+
-
-    // and write it out

openpgpsdk/trunk/src/advanced/adv_crypto.c

@@ -23 +23 @@
-    assert(skey->public_key.algorithm == OPS_PKA_RSA);
-
-    /*
-    fprintf(stderr,"\nDECRYPTING\n");
-    fprintf(stderr,"encrypted data     : ");
@@ -29 +28 @@
-        fprintf(stderr,"%2x ", encmpibuf[i]);
-    fprintf(stderr,"\n");
-    */
-
-    n=ops_rsa_private_decrypt(mpibuf,encmpibuf,(BN_num_bits(encmpi)+7)/8,
@@ -35 +33 @@
-    assert(n!=-1);
-
-    /*
-    fprintf(stderr,"decrypted encoded m buf     : ");
-    for (i=0; i<16; i++)
-        fprintf(stderr,"%2x ", mpibuf[i]);
-    fprintf(stderr,"\n");
-    */
-
-    if(n <= 0)
-        return -1;
-
-
-
+
-    hexdump(mpibuf,n);
-    printf("\n");
-    */
-
-    // Decode EME-PKCS1_V1_5 (RFC 2437).
@@ -70 +64 @@
-        memcpy(buf,mpibuf+i,n-i);
-
-
-
+
-    int j;
-    for (j=0; j<n-i; j++)
-        printf("%2x ",buf[j]);
-    printf("\n");
-    */
-
-    return n-i;

openpgpsdk/trunk/src/advanced/adv_openssl_crypto.c

@@ -168 +168 @@
-    n=RSA_private_decrypt(length,in,out,orsa,RSA_NO_PADDING);
-
+    printf("ops_rsa_private_decrypt: n=%d\n",n);
+
-    char errbuf[1024];
-    errbuf[0]='\0';

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

@@ -12 +12 @@
-#include <openpgpsdk/errors.h>
-#include <openpgpsdk/readerwriter.h>
+#include "openpgpsdk/packet-show.h"
+
-#include "parse_local.h"
-
@@ -2179 +2181 @@
-    const ops_secret_key_t *secret;
-    
-
+
+
+
-    unsigned char unencoded_m_buf[sz_unencoded_m_buf];
-    
@@ -2198 +2202 @@
-        return 0;
-
-    /*
-    int i;
-    int x=sizeof C.pk_session_key.key_id;
-
+: public key
-    for (i=0; i<x; i++)
-        printf("%2x ", C.pk_session_key.key_id[i]);
-    printf("\n");
-    */
-
-    if(!limited_read(c,1,region,pinfo))
@@ -2253 +2255 @@
-
-    if(n < 1)
-
+
+
+
+
-
-    // PKA
-    C.pk_session_key.symmetric_algorithm=unencoded_m_buf[0];
+
+    if (C.pk_session_key.symmetric_algorithm!=OPS_SA_CAST5)
+        //        && C.pk_session_key.symmetric_algorithm!=OPS_SA_AES_256)
+        {
+        fprintf(stderr,"*** Warning: should implement support for %s\n",
+                ops_show_symmetric_algorithm(C.pk_session_key.symmetric_algorithm));
+        }
+    //    assert(unencoded_m_buf[0]==OPS_SA_CAST5 || OPS_SA_AES_256);
-    assert(unencoded_m_buf[0]==OPS_SA_CAST5);
-    k=ops_key_size(C.pk_session_key.symmetric_algorithm);
-
-    if((unsigned)n != k+3)
+        {
-        ERR2P(pinfo,"decrypted message wrong length (got %d expected %d)",
-              n,k+3);
+        return 0;
+        }
-    
-    assert(k <= sizeof C.pk_session_key.key);
@@ -2268 +2284 @@
-    memcpy(C.pk_session_key.key,unencoded_m_buf+1,k);
-
-    /*
-    printf("session key recovered (len=%d):\n",k);
-    unsigned int j;
@@ -2274 +2289 @@
-        printf("%2x ", C.pk_session_key.key[j]);
-    printf("\n");
-    */
-
-    C.pk_session_key.checksum=unencoded_m_buf[k+1]+(unencoded_m_buf[k+2] << 8);
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    CBP(pinfo,OPS_PTAG_CT_PK_SESSION_KEY,&content);
-
@@ -2346 +2368 @@
-        size_t sz_plaintext=decrypted_region.length-sz_preamble-sz_mdc;
-
-//        
+
-        unsigned char* plaintext=buf+sz_preamble;
-        unsigned char* mdc=plaintext+sz_plaintext;
-        unsigned char* mdc_hash=mdc+2;
-    
+        ops_calc_mdc_hash(preamble,sz_preamble,plaintext,sz_plaintext,&hashed[0]);
+        /*
-        unsigned char c[0];
-
@@ -2360 +2384 @@
-        
-        hash.finish(&hash,&hashed[0]);
+        */
-
-        if (memcmp(mdc_hash,hashed,OPS_SHA1_HASH_SIZE))
@@ -2420 +2445 @@
-
-// XXX: make this static?
-
+se_
-                     ops_parse_info_t *pinfo)
-    {
@@ -2532 +2557 @@
-    /* The content of an encrypted data packet is more OpenPGP packets
-       once decrypted, so recursively handle them */
-
+se_
-    }
-

openpgpsdk/trunk/tests/test_packet_types.c

@@ -9 +9 @@
-#include "openpgpsdk/crypto.h"
-#include "openpgpsdk/readerwriter.h"
+#include "openpgpsdk/random.h"
-#include "../src/advanced/parse_local.h"
+
-#include <openssl/aes.h>
-#include <openssl/cast.h>
@@ -268 +270 @@
-        ops_create_info_t *cinfo;
-        ops_parse_info_t *pinfo;
-
+    //
-        char* plaintext="Text to be hashed in test_ops_mdc";
-        int rtn=0;
-
+    ops_crypt_t crypt;
+    unsigned char hashed[SHA_DIGEST_LENGTH];
+    unsigned char* preamble;
+    ops_crypt_any(&crypt, OPS_SA_CAST5);
+    ops_encrypt_init(&crypt);
+
+    size_t sz_preamble=crypt.blocksize+2;
+    preamble=ops_mallocz(sz_preamble);
+    ops_random(preamble, crypt.blocksize);
+    preamble[crypt.blocksize]=preamble[crypt.blocksize-2];
+    preamble[crypt.blocksize+1]=preamble[crypt.blocksize-1];
+
-        // Write packet to memory
-        ops_setup_memory_write(&cinfo,&mem,strlen(plaintext));
-
+
+
-
-        // Read back and verify contents
@@ -285 +300 @@
-        // can verify it's been written correctly.
-
+#ifdef TODO
-    int x;
-    unsigned char hashed[SHA_DIGEST_LENGTH];
@@ -302 +318 @@
-    if (mdc_data)
-        CU_ASSERT(memcmp(mdc_data, hashed, OPS_SHA1_HASH_SIZE)==0);
+#endif
-
-        // clean up

openpgpsdk/trunk/tests/test_rsa_decrypt.c

@@ -27 +27 @@
-static char *current_passphrase=NULL;
-
-
+//
-
-/*
@@ -294 +294 @@
-    // File contents should match
-    create_testtext(filename,&testtext[0],MAXBUF);
-strcmp(text,testtext
+memcmp(literal_data,testtext,sz_literal_data
-    }
-
@@ -348 +348 @@
-            return NULL;
-    
+#ifdef TODO
-    if (NULL == CU_add_test(suite, "Armoured, no passphrase", test_rsa_decrypt_armour_nopassphrase))
-            return NULL;
@@ -356 +357 @@
-    if (NULL == CU_add_test(suite, "Armoured, passphrase", test_rsa_decrypt_armour_passphrase))
-            return NULL;
-
+#endif
-    return suite;
-}