aboutsummaryrefslogtreecommitdiffstats
path: root/cipher/cipher.c
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>1999-04-09 10:34:44 +0000
committerWerner Koch <[email protected]>1999-04-09 10:34:44 +0000
commit02d018f9c84c8f3462ff30c2f5336a3acbc9cd38 (patch)
tree0ac69079ad82fc3c6767fa571428da93d091ef81 /cipher/cipher.c
parentSee ChangeLog: Thu Apr 8 09:35:53 CEST 1999 Werner Koch (diff)
downloadgnupg-02d018f9c84c8f3462ff30c2f5336a3acbc9cd38.tar.gz
gnupg-02d018f9c84c8f3462ff30c2f5336a3acbc9cd38.zip
See ChangeLog: Fri Apr 9 12:26:25 CEST 1999 Werner Koch
Diffstat (limited to '')
-rw-r--r--cipher/cipher.c25
1 files changed, 1 insertions, 24 deletions
diff --git a/cipher/cipher.c b/cipher/cipher.c
index 0306c378d..cba011be1 100644
--- a/cipher/cipher.c
+++ b/cipher/cipher.c
@@ -127,28 +127,6 @@ setup_cipher_table(void)
if( !cipher_table[i].name )
BUG();
i++;
- cipher_table[i].algo = CIPHER_ALGO_BLOWFISH160;
- cipher_table[i].name = blowfish_get_info( cipher_table[i].algo,
- &cipher_table[i].keylen,
- &cipher_table[i].blocksize,
- &cipher_table[i].contextsize,
- &cipher_table[i].setkey,
- &cipher_table[i].encrypt,
- &cipher_table[i].decrypt );
- if( !cipher_table[i].name )
- BUG();
- i++;
- cipher_table[i].algo = CIPHER_ALGO_TWOFISH_OLD;
- cipher_table[i].name = twofish_get_info( cipher_table[i].algo,
- &cipher_table[i].keylen,
- &cipher_table[i].blocksize,
- &cipher_table[i].contextsize,
- &cipher_table[i].setkey,
- &cipher_table[i].encrypt,
- &cipher_table[i].decrypt );
- if( !cipher_table[i].name )
- BUG();
- i++;
cipher_table[i].algo = CIPHER_ALGO_DUMMY;
cipher_table[i].name = "DUMMY";
cipher_table[i].blocksize = 8;
@@ -362,8 +340,7 @@ cipher_open( int algo, int mode, int secure )
if( algo == CIPHER_ALGO_DUMMY )
hd->mode = CIPHER_MODE_DUMMY;
else if( mode == CIPHER_MODE_AUTO_CFB ) {
- if( hd->blocksize > 8
- || algo == CIPHER_ALGO_BLOWFISH160 || algo >= 100 )
+ if( algo >= 100 )
hd->mode = CIPHER_MODE_CFB;
else
hd->mode = CIPHER_MODE_PHILS_CFB;