Changeset 661

Timestamp:

06/08/09 13:02:36

Author:

ben

Message:

Add Camellia support (might not work correctly if OPENSSL_NO_CAMELLIA
is defined), avoid deprecated functions.

Files:

• openpgpsdk/trunk/include/openpgpsdk/crypto.h (modified) (1 diff)
• openpgpsdk/trunk/include/openpgpsdk/packet.h (modified) (1 diff)
• openpgpsdk/trunk/src/lib/openssl_crypto.c (modified) (1 diff)
• openpgpsdk/trunk/src/lib/packet-show.c (modified) (1 diff)
• openpgpsdk/trunk/src/lib/symmetric.c (modified) (5 diffs)
• openpgpsdk/trunk/tests/test_crypto.c (modified) (8 diffs)

openpgpsdk/trunk/include/openpgpsdk/crypto.h

@@ -31 +31 @@
-#include "packet-parse.h"
-#include <openssl/dsa.h>
+#include <openssl/opensslv.h>
+#include <openssl/opensslconf.h>
+
+#if OPENSSL_VERSION_NUMBER < 0x00908030L
+# define OPENSSL_NO_CAMELLIA
+#endif
-
-#define OPS_MIN_HASH_SIZE       16

openpgpsdk/trunk/include/openpgpsdk/packet.h

@@ -421 +421 @@
-    OPS_SA_AES_256      =9, /*!< AES with 256-bit key */
-    OPS_SA_TWOFISH      =10, /*!< Twofish with 256-bit key (TWOFISH) */
+    OPS_SA_CAMELLIA_128 =11, /*!< Camellia with 128-bit key */
+    OPS_SA_CAMELLIA_192 =12, /*!< Camellia with 192-bit key */
+    OPS_SA_CAMELLIA_256 =13, /*!< Camellia with 256-bit key */
-    } ops_symmetric_algorithm_t;
-

openpgpsdk/trunk/src/lib/openssl_crypto.c

@@ -609 +609 @@
-    {
-    CRYPTO_cleanup_all_ex_data();
-
+
+
-#ifdef DMALLOC
-    CRYPTO_mem_leaks_fp(stderr);

openpgpsdk/trunk/src/lib/packet-show.c

@@ -213 +213 @@
-    { OPS_SA_AES_256,           "AES (256-bit key)" },
-    { OPS_SA_TWOFISH,           "Twofish(256-bit key)" },
+    { OPS_SA_CAMELLIA_128,      "Camellia (128-bit key)" },
+    { OPS_SA_CAMELLIA_192,      "Camellia (192-bit key)" },
+    { OPS_SA_CAMELLIA_256,      "Camellia (256-bit key)" },
-    { 0x00,             NULL }, /* this is the end-of-array marker */
-    };

openpgpsdk/trunk/src/lib/symmetric.c

@@ -25 +25 @@
-#include <openssl/cast.h>
-#ifndef OPENSSL_NO_IDEA
-
+ 
-#endif
-#include <openssl/aes.h>
+#ifndef OPENSSL_NO_CAMELLIA
+# include <openssl/camellia.h>
+#endif
-#include <openssl/des.h>
-#include "parse_local.h"
@@ -279 +282 @@
-    };
-
+#ifndef OPENSSL_NO_CAMELLIA
+
+// CAMELLIA with 128-bit key
+
+#define KEYBITS_CAMELLIA128 128
+
+static void camellia128_init(ops_crypt_t *crypt)
+    {
+    if (crypt->encrypt_key)
+        free(crypt->encrypt_key);
+    crypt->encrypt_key=malloc(sizeof(CAMELLIA_KEY));
+    if (Camellia_set_key(crypt->key,KEYBITS_CAMELLIA128,crypt->encrypt_key))
+        fprintf(stderr,"camellia128_init: Error setting encrypt_key\n");
+
+    if (crypt->decrypt_key)
+        free(crypt->decrypt_key);
+    crypt->decrypt_key=malloc(sizeof(CAMELLIA_KEY));
+    if (Camellia_set_key(crypt->key,KEYBITS_CAMELLIA128,crypt->decrypt_key))
+        fprintf(stderr,"camellia128_init: Error setting decrypt_key\n");
+    }
+
+static void camellia_block_encrypt(ops_crypt_t *crypt,void *out,const void *in)
+    { Camellia_encrypt(in,out,crypt->encrypt_key); }
+
+static void camellia_block_decrypt(ops_crypt_t *crypt,void *out,const void *in)
+    { Camellia_decrypt(in,out,crypt->decrypt_key); }
+
+static void camellia_cfb_encrypt(ops_crypt_t *crypt,void *out,const void *in, size_t count)
+    { 
+    Camellia_cfb128_encrypt(in,out,count,
+                       crypt->encrypt_key, crypt->iv, (int *)&crypt->num,
+                       CAMELLIA_ENCRYPT); 
+    }
+
+static void camellia_cfb_decrypt(ops_crypt_t *crypt,void *out,const void *in, size_t count)
+    { 
+    Camellia_cfb128_encrypt(in,out,count,
+                       crypt->encrypt_key, crypt->iv, (int *)&crypt->num,
+                       CAMELLIA_DECRYPT); 
+    }
+
+static const ops_crypt_t camellia128=
+    {
+    OPS_SA_CAMELLIA_128,
+    CAMELLIA_BLOCK_SIZE,
+    KEYBITS_CAMELLIA128/8,
+    std_set_iv,
+    std_set_key,
+    camellia128_init,
+    std_resync,
+    camellia_block_encrypt,
+    camellia_block_decrypt,
+    camellia_cfb_encrypt,
+    camellia_cfb_decrypt,
+    std_finish,
+    TRAILER
+    };
+
+// CAMELLIA with 192-bit key
+
+#define KEYBITS_CAMELLIA192 192
+
+static void camellia192_init(ops_crypt_t *crypt)
+    {
+    if (crypt->encrypt_key)
+        free(crypt->encrypt_key);
+    crypt->encrypt_key=malloc(sizeof(CAMELLIA_KEY));
+    if (Camellia_set_key(crypt->key,KEYBITS_CAMELLIA192,crypt->encrypt_key))
+        fprintf(stderr,"camellia192_init: Error setting encrypt_key\n");
+
+    if (crypt->decrypt_key)
+        free(crypt->decrypt_key);
+    crypt->decrypt_key=malloc(sizeof(CAMELLIA_KEY));
+    if (Camellia_set_key(crypt->key,KEYBITS_CAMELLIA192,crypt->decrypt_key))
+        fprintf(stderr,"camellia192_init: Error setting decrypt_key\n");
+    }
+
+static const ops_crypt_t camellia192=
+    {
+    OPS_SA_CAMELLIA_192,
+    CAMELLIA_BLOCK_SIZE,
+    KEYBITS_CAMELLIA192/8,
+    std_set_iv,
+    std_set_key,
+    camellia192_init,
+    std_resync,
+    camellia_block_encrypt,
+    camellia_block_decrypt,
+    camellia_cfb_encrypt,
+    camellia_cfb_decrypt,
+    std_finish,
+    TRAILER
+    };
+
+// CAMELLIA with 256-bit key
+
+#define KEYBITS_CAMELLIA256 256
+
+static void camellia256_init(ops_crypt_t *crypt)
+    {
+    if (crypt->encrypt_key)
+        free(crypt->encrypt_key);
+    crypt->encrypt_key=malloc(sizeof(CAMELLIA_KEY));
+    if (Camellia_set_key(crypt->key,KEYBITS_CAMELLIA256,crypt->encrypt_key))
+        fprintf(stderr,"camellia256_init: Error setting encrypt_key\n");
+
+    if (crypt->decrypt_key)
+        free(crypt->decrypt_key);
+    crypt->decrypt_key=malloc(sizeof(CAMELLIA_KEY));
+    if (Camellia_set_key(crypt->key,KEYBITS_CAMELLIA256,crypt->decrypt_key))
+        fprintf(stderr,"camellia256_init: Error setting decrypt_key\n");
+    }
+
+static const ops_crypt_t camellia256=
+    {
+    OPS_SA_CAMELLIA_256,
+    CAMELLIA_BLOCK_SIZE,
+    KEYBITS_CAMELLIA256/8,
+    std_set_iv,
+    std_set_key,
+    camellia256_init,
+    std_resync,
+    camellia_block_encrypt,
+    camellia_block_decrypt,
+    camellia_cfb_encrypt,
+    camellia_cfb_decrypt,
+    std_finish,
+    TRAILER
+    };
+
+#endif  // ndef OPENSSL_NO_CAMELLIA
+
-// Triple DES
-
@@ -310 +445 @@
-    }
-
-
+
+
+
+
-    { 
-    DES_key_schedule *keys=crypt->encrypt_key;
-    DES_ede3_cfb64_encrypt(in,out,count,
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-    { 
-    DES_key_schedule *keys=crypt->encrypt_key;
-    DES_ede3_cfb64_encrypt(in,out,count,
-
-
+
+
+
-    }
-
@@ -361 +504 @@
-        return &aes256;
-
+#ifndef OPENSSL_NO_CAMELLIA
+    case OPS_SA_CAMELLIA_128:
+        return &camellia128;
+
+    case OPS_SA_CAMELLIA_192:
+        return &camellia192;
+
+    case OPS_SA_CAMELLIA_256:
+        return &camellia256;
+#endif  // ndef OPENSSL_NO_CAMELLIA
+
-    case OPS_SA_TRIPLEDES:
-        return &tripledes;
-
-    default:
-
+
+
-        //      assert(0);
-        }
@@ -484 +639 @@
-    case OPS_SA_AES_128:
-    case OPS_SA_AES_256:
+    case OPS_SA_CAMELLIA_128:
+    case OPS_SA_CAMELLIA_192:
+    case OPS_SA_CAMELLIA_256:
-    case OPS_SA_CAST5:
-    case OPS_SA_TRIPLEDES:

openpgpsdk/trunk/tests/test_crypto.c

@@ -143 +143 @@
-    }
-
+#ifndef OPENSSL_NO_CAMELLIA
+static void test_ecb_camellia128()
+    {
+    test_ecb(OPS_SA_CAMELLIA_128);
+    }
+
+static void test_ecb_camellia192()
+    {
+    test_ecb(OPS_SA_CAMELLIA_192);
+    }
+
+static void test_ecb_camellia256()
+    {
+    test_ecb(OPS_SA_CAMELLIA_256);
+    }
+#endif  // ndef OPENSSL_NO_CAMELLIA
+
-static void test_cfb(ops_symmetric_algorithm_t alg)
-    {
@@ -166 +183 @@
-    if(!ops_crypt_any(&crypt, alg))
-        {
-
+
+
-        CU_FAIL("Failed to initialise crypt struct");
-        return;
@@ -198 +216 @@
-        // plaintext
-        printf("\n");
-
-
-
-
+
+
+
+
+
+
+
+
-
-        // encrypted
-
+
+
-               out[0], out[1], out[2], out[3], out[4], out[5], out[6], out[7]);
-        printf("encrypted: %c    %c    %c    %c      %c    %c    %c    %c\n", 
@@ -210 +233 @@
-
-        // decrypted
-
-
+
+
+
+
-        printf("decrypted: %c    %c    %c    %c      %c    %c    %c    %c\n", 
-
+
+
-        }
-    }
@@ -246 +272 @@
-    }
-
+static void test_cfb_camellia128()
+    {
+    test_cfb(OPS_SA_CAMELLIA_128);
+    }
+
+static void test_cfb_camellia192()
+    {
+    test_cfb(OPS_SA_CAMELLIA_192);
+    }
+
+static void test_cfb_camellia256()
+    {
+    test_cfb(OPS_SA_CAMELLIA_256);
+    }
+
-static void test_dsa_verify()
-    {
@@ -252 +293 @@
-    // and signature generation when these are implemented in OPS.
-
-//DSA *params=
-
- *dsa = DSA_generate_parameters(100, NULL, 0, NULL
+DSA *dsa = 
+
+_generate_parameters_ex(dsa, 100, NULL, 0
-    CU_ASSERT(DSA_generate_key(dsa)==1);
-
@@ -300 +341 @@
-    //    test_one_cfb(OPS_SA_TWOFISH);
-
+#ifndef OPENSSL_NO_CAMELLIA
+    if (NULL == CU_add_test(suite, "Test ECB (Camellia 128)",
+                            test_ecb_camellia128))
+            return NULL;
+
+    if (NULL == CU_add_test(suite, "Test ECB (Camellia 192)",
+                            test_ecb_camellia192))
+            return NULL;
+
+    if (NULL == CU_add_test(suite, "Test ECB (Camellia 256)",
+                            test_ecb_camellia256))
+            return NULL;
+#endif  // ndef OPENSSL_NO_CAMELLIA
+
+
-    /* CFB tests */
-
@@ -327 +383 @@
-    //    test_one_cfb(OPS_SA_TWOFISH);
-
+    if (NULL == CU_add_test(suite, "Test CFB (Camellia 128)",
+                            test_cfb_camellia128))
+        return NULL;
+
+    if (NULL == CU_add_test(suite, "Test CFB (Camellia 192)",
+                            test_cfb_camellia192))
+        return NULL;
+
+    if (NULL == CU_add_test(suite, "Test CFB (Camellia 256)",
+                            test_cfb_camellia256))
+        return NULL;
+
-    if (NULL == CU_add_test(suite, "Test DSA Verify", test_dsa_verify))
-        return NULL;