diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2005-04-08 16:04:18 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2005-04-08 16:04:18 +0000 |
| commit | a26db2f0b98e349beb5eab2b74a71922172a45d5 (patch) | |
| tree | b943e31b0097c15088492bfd1cef46384e28da52 | |
| parent | b4985b1540669c7865a4cd7397adfa3b47c7cbf6 (diff) | |
un-ifdef USE_BLOWFISH
| -rw-r--r-- | sbin/isakmpd/conf.c | 4 | ||||
| -rw-r--r-- | sbin/isakmpd/crypto.c | 6 |
2 files changed, 3 insertions, 7 deletions
diff --git a/sbin/isakmpd/conf.c b/sbin/isakmpd/conf.c index 9506f4bb7dc..2168eea451c 100644 --- a/sbin/isakmpd/conf.c +++ b/sbin/isakmpd/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.79 2005/04/06 16:00:20 deraadt Exp $ */ +/* $OpenBSD: conf.c,v 1.80 2005/04/08 16:04:17 deraadt Exp $ */ /* $EOM: conf.c,v 1.48 2000/12/04 02:04:29 angelos Exp $ */ /* @@ -318,7 +318,7 @@ conf_parse(int trans, char *buf, size_t sz) * * DH group defaults to MODP_1024. * - * XXX We may want to support USE_BLOWFISH, USE_TRIPLEDES, etc... + * XXX We may want to support USE_TRIPLEDES, etc... * XXX No EC2N DH support here yet. */ diff --git a/sbin/isakmpd/crypto.c b/sbin/isakmpd/crypto.c index f815cd6f1d3..5cffb0f27a3 100644 --- a/sbin/isakmpd/crypto.c +++ b/sbin/isakmpd/crypto.c @@ -1,4 +1,4 @@ -/* $OpenBSD: crypto.c,v 1.23 2005/04/05 18:13:20 cloder Exp $ */ +/* $OpenBSD: crypto.c,v 1.24 2005/04/08 16:04:17 deraadt Exp $ */ /* $EOM: crypto.c,v 1.32 2000/03/07 20:08:51 niklas Exp $ */ /* @@ -72,14 +72,12 @@ struct crypto_xf transforms[] = { des3_encrypt, des3_decrypt }, #endif -#ifdef USE_BLOWFISH { BLOWFISH_CBC, "Blowfish (CBC-Mode)", 12, 56, BLOCKSIZE, 0, blf_init, blf_encrypt, blf_decrypt }, -#endif #ifdef USE_CAST { CAST_CBC, "CAST (CBC-Mode)", 12, 16, @@ -170,7 +168,6 @@ des3_decrypt(struct keystate *ks, u_int8_t *data, u_int16_t len) #undef DC #endif /* USE_TRIPLEDES */ -#ifdef USE_BLOWFISH enum cryptoerr blf_init(struct keystate *ks, u_int8_t *key, u_int16_t len) { @@ -223,7 +220,6 @@ blf_decrypt(struct keystate *ks, u_int8_t *data, u_int16_t len) SET_32BIT_BIG(data + 4, xr); XOR64(data, ks->riv); } -#endif /* USE_BLOWFISH */ #ifdef USE_CAST enum cryptoerr |