diff options
| author | Niklas Hallqvist <niklas@cvs.openbsd.org> | 2000-03-08 08:41:42 +0000 |
|---|---|---|
| committer | Niklas Hallqvist <niklas@cvs.openbsd.org> | 2000-03-08 08:41:42 +0000 |
| commit | f63b5b0f659b5541f2761dd40425b628253326cc (patch) | |
| tree | f60ef022e0751b3535a6ac3fcf89397041d4f1fc /sbin | |
| parent | ed4b92080dd448bd585d6208f5177a02b8bd1ea9 (diff) | |
Merge with EOM 1.32
author: niklas
Use a clearer pointer arithmetic
author: niklas
Multiple DES API support
author: niklas
argh
author: niklas
More braindamage with USE_ macros
Diffstat (limited to 'sbin')
| -rw-r--r-- | sbin/isakmpd/crypto.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sbin/isakmpd/crypto.c b/sbin/isakmpd/crypto.c index 70a989f0f1c..74cca633a03 100644 --- a/sbin/isakmpd/crypto.c +++ b/sbin/isakmpd/crypto.c @@ -1,5 +1,5 @@ -/* $OpenBSD: crypto.c,v 1.9 2000/02/25 17:23:39 niklas Exp $ */ -/* $EOM: crypto.c,v 1.28 2000/02/20 19:58:36 niklas Exp $ */ +/* $OpenBSD: crypto.c,v 1.10 2000/03/08 08:41:41 niklas Exp $ */ +/* $EOM: crypto.c,v 1.32 2000/03/07 20:08:51 niklas Exp $ */ /* * Copyright (c) 1998 Niels Provos. All rights reserved. @@ -124,13 +124,13 @@ enum cryptoerr des3_init (struct keystate *ks, u_int8_t *key, u_int16_t len) { des_set_odd_parity (DC key); - des_set_odd_parity (DC key + 1); - des_set_odd_parity (DC key + 2); + des_set_odd_parity (DC (key + 8)); + des_set_odd_parity (DC (key + 16)); /* As of the draft Tripe-DES does not check for weak keys */ des_set_key (DC key, ks->ks_des[0]); - des_set_key (DC key + 1, ks->ks_des[1]); - des_set_key (DC key + 2, ks->ks_des[2]); + des_set_key (DC (key + 8), ks->ks_des[1]); + des_set_key (DC (key + 16), ks->ks_des[2]); return EOKAY; } |