security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-12-23 10:29:58 +01:00
Code Activity

cipher.c (setup_cipher_table, cipher_open, cipher_encrypt, cipher_decrypt,

Browse Source 
dummy_setkey, dummy_encrypt_block, dummy_decrypt_block): the dummy cipher
should only be built on development versions.
This commit is contained in:
David Shaw 2002-04-10 17:25:22 +00:00
parent 170604883a
commit f29240cc2e
2 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cipher/ChangeLog
View File

@ -1,3 +1,10 @@
2002-04-10 David Shaw <dshaw@jabberwocky.com>
* cipher.c (setup_cipher_table, cipher_open, cipher_encrypt,
cipher_decrypt, dummy_setkey, dummy_encrypt_block,
dummy_decrypt_block): the dummy cipher should only be built on
development versions.
2002-04-06 Werner Koch <wk@gnupg.org> 2002-04-06 Werner Koch <wk@gnupg.org>
* rijndael.c (rijndael_get_info): We do only support a 128 bit * rijndael.c (rijndael_get_info): We do only support a 128 bit

20
cipher/cipher.c
View File

@ -65,13 +65,14 @@ struct cipher_handle_s {
}; };
#ifdef IS_DEVELOPMENT_VERSION
static int static int
dummy_setkey( void *c, byte *key, unsigned keylen ) { return 0; } dummy_setkey( void *c, byte *key, unsigned keylen ) { return 0; }
static void static void
dummy_encrypt_block( void *c, byte *outbuf, byte *inbuf ) { BUG(); } dummy_encrypt_block( void *c, byte *outbuf, byte *inbuf ) { BUG(); }
static void static void
dummy_decrypt_block( void *c, byte *outbuf, byte *inbuf ) { BUG(); } dummy_decrypt_block( void *c, byte *outbuf, byte *inbuf ) { BUG(); }
#endif
/**************** /****************
@ -161,6 +162,8 @@ setup_cipher_table(void)
if( !cipher_table[i].name ) if( !cipher_table[i].name )
BUG(); BUG();
i++; i++;
#ifdef IS_DEVELOPMENT_VERSION
cipher_table[i].algo = CIPHER_ALGO_DUMMY; cipher_table[i].algo = CIPHER_ALGO_DUMMY;
cipher_table[i].name = "DUMMY"; cipher_table[i].name = "DUMMY";
cipher_table[i].blocksize = 8; cipher_table[i].blocksize = 8;
@ -170,6 +173,7 @@ setup_cipher_table(void)
cipher_table[i].encrypt = dummy_encrypt_block; cipher_table[i].encrypt = dummy_encrypt_block;
cipher_table[i].decrypt = dummy_decrypt_block; cipher_table[i].decrypt = dummy_decrypt_block;
i++; i++;
#endif
for( ; i < TABLE_SIZE; i++ ) for( ; i < TABLE_SIZE; i++ )
cipher_table[i].name = NULL; cipher_table[i].name = NULL;
@ -406,9 +410,8 @@ cipher_open( int algo, int mode, int secure )
hd->setkey = cipher_table[i].setkey; hd->setkey = cipher_table[i].setkey;
hd->encrypt = cipher_table[i].encrypt; hd->encrypt = cipher_table[i].encrypt;
hd->decrypt = cipher_table[i].decrypt; hd->decrypt = cipher_table[i].decrypt;
if( algo == CIPHER_ALGO_DUMMY )
hd->mode = CIPHER_MODE_DUMMY; if( mode == CIPHER_MODE_AUTO_CFB ) {
else if( mode == CIPHER_MODE_AUTO_CFB ) {
if( algo >= 100 ) if( algo >= 100 )
hd->mode = CIPHER_MODE_CFB; hd->mode = CIPHER_MODE_CFB;
else else
@ -417,6 +420,11 @@ cipher_open( int algo, int mode, int secure )
else else
hd->mode = mode; hd->mode = mode;
#ifdef IS_DEVELOPMENT_VERSION
if( algo == CIPHER_ALGO_DUMMY )
hd->mode = CIPHER_MODE_DUMMY;
#endif
return hd; return hd;
} }
@ -644,10 +652,12 @@ cipher_encrypt( CIPHER_HANDLE c, byte *outbuf, byte *inbuf, unsigned nbytes )
case CIPHER_MODE_PHILS_CFB: case CIPHER_MODE_PHILS_CFB:
do_cfb_encrypt(c, outbuf, inbuf, nbytes ); do_cfb_encrypt(c, outbuf, inbuf, nbytes );
break; break;
#ifdef IS_DEVELOPMENT_VERSION
case CIPHER_MODE_DUMMY: case CIPHER_MODE_DUMMY:
if( inbuf != outbuf ) if( inbuf != outbuf )
memmove( outbuf, inbuf, nbytes ); memmove( outbuf, inbuf, nbytes );
break; break;
#endif
default: log_fatal("cipher_encrypt: invalid mode %d\n", c->mode ); default: log_fatal("cipher_encrypt: invalid mode %d\n", c->mode );
} }
} }
@ -674,10 +684,12 @@ cipher_decrypt( CIPHER_HANDLE c, byte *outbuf, byte *inbuf, unsigned nbytes )
case CIPHER_MODE_PHILS_CFB: case CIPHER_MODE_PHILS_CFB:
do_cfb_decrypt(c, outbuf, inbuf, nbytes ); do_cfb_decrypt(c, outbuf, inbuf, nbytes );
break; break;
#ifdef IS_DEVELOPMENT_VERSION
case CIPHER_MODE_DUMMY: case CIPHER_MODE_DUMMY:
if( inbuf != outbuf ) if( inbuf != outbuf )
memmove( outbuf, inbuf, nbytes ); memmove( outbuf, inbuf, nbytes );
break; break;
#endif
default: log_fatal("cipher_decrypt: invalid mode %d\n", c->mode ); default: log_fatal("cipher_decrypt: invalid mode %d\n", c->mode );
} }
} }