Changeset 479

Show
Ignore:
Timestamp:
07/23/07 09:28:03
Author:
rachel
Message:

Let's not use magic numbers. #defines make it clearer.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • openpgpsdk/trunk/include/openpgpsdk/crypto.h

    r473 r479  
    3636typedef void ops_crypt_block_encrypt_t(ops_crypt_t *crypt,void *out, 
    3737                                       const void *in); 
     38typedef void ops_crypt_block_decrypt_t(ops_crypt_t *crypt,void *out, 
     39                                       const void *in); 
    3840typedef void ops_crypt_finish_t(ops_crypt_t *crypt); 
    3941 
    …… 
    4951    ops_crypt_resync_t *decrypt_resync; 
    5052    ops_crypt_block_encrypt_t *block_encrypt; 
     53    ops_crypt_block_decrypt_t *block_decrypt; 
    5154    ops_crypt_finish_t *decrypt_finish; 
    5255    unsigned char iv[OPS_MAX_BLOCK_SIZE]; 

  • openpgpsdk/trunk/src/advanced/adv_symmetric.c

    r473 r479  
    174174 
    175175static void cast5_encrypt(ops_crypt_t *crypt,void *out,const void *in) 
    176     { CAST_ecb_encrypt(in,out,crypt->data,1); } 
     176    { CAST_ecb_encrypt(in,out,crypt->data,CAST_ENCRYPT); } 
     177 
     178static void cast5_decrypt(ops_crypt_t *crypt,void *out,const void *in) 
     179    { CAST_ecb_encrypt(in,out,crypt->data,CAST_DECRYPT); } 
    177180 
    178181#define TRAILER         "","","","",0,NULL 
    …… 
    188191    std_resync, 
    189192    cast5_encrypt, 
     193    cast5_decrypt, 
    190194    std_finish, 
    191195    TRAILER 
    …… 
    206210static void idea_block_encrypt(ops_crypt_t *crypt,void *out,const void *in) 
    207211    { idea_ecb_encrypt(in,out,crypt->data); } 
     212 
     213static void idea_block_decrypt(ops_crypt_t *crypt,void *out,const void *in) 
     214    { idea_block_encrypt(crypt,out,in); } 
    208215 
    209216static const ops_crypt_t idea= 
    …… 
    217224    std_resync, 
    218225    idea_block_encrypt, 
     226    idea_block_decrypt, 
    219227    std_finish, 
    220228    TRAILER 
    …… 
    229237    } 
    230238 
     239/* 
    231240static void aes_block_encrypt(ops_crypt_t *crypt,void *out,const void *in) 
    232241    { AES_encrypt(in,out,crypt->data); } 
     242    */ 
     243 
     244static void aes_block_encrypt(ops_crypt_t *crypt,void *out,const void *in) 
     245    { AES_ecb_encrypt(in,out,crypt->data, AES_ENCRYPT); } 
     246 
     247static void aes_block_decrypt(ops_crypt_t *crypt,void *out,const void *in) 
     248    { AES_ecb_encrypt(in,out,crypt->data, AES_DECRYPT); } 
    233249 
    234250static const ops_crypt_t aes256= 
    …… 
    242258    std_resync, 
    243259    aes_block_encrypt, 
     260    aes_block_decrypt, 
    244261    std_finish, 
    245262    TRAILER 
    …… 
    263280    DES_key_schedule *keys=crypt->data; 
    264281 
    265     DES_ecb3_encrypt((void *)in,out,&keys[0],&keys[1],&keys[2],1); 
     282    DES_ecb3_encrypt((void *)in,out,&keys[0],&keys[1],&keys[2],DES_ENCRYPT); 
     283    } 
     284 
     285static void tripledes_block_decrypt(ops_crypt_t *crypt,void *out, 
     286                                    const void *in) 
     287    { 
     288    DES_key_schedule *keys=crypt->data; 
     289 
     290    DES_ecb3_encrypt((void *)in,out,&keys[0],&keys[1],&keys[2],DES_DECRYPT); 
    266291    } 
    267292 
    …… 
    276301    std_resync, 
    277302    tripledes_block_encrypt, 
     303    tripledes_block_decrypt, 
    278304    std_finish, 
    279305    TRAILER 
    …… 
    332358void ops_encrypt_init(ops_crypt_t * encrypt) 
    333359    { 
     360        return ops_decrypt_init(encrypt); 
    334361    // \todo does there need to be both a ops_encrypt_init and a ops_decrypt_init? 
    335362    encrypt->base_init(encrypt);