diff options
| author | Niklas Hallqvist <niklas@cvs.openbsd.org> | 1999-04-19 21:22:50 +0000 |
|---|---|---|
| committer | Niklas Hallqvist <niklas@cvs.openbsd.org> | 1999-04-19 21:22:50 +0000 |
| commit | b7f589193443583be8c7d76aa02aee6f758c3713 (patch) | |
| tree | c161bb230c30e0554e847885905c36f72959ef47 /sbin/isakmpd/crypto.c | |
| parent | a5d9c3a2479505981ad188dd59c009af1e8b455c (diff) | |
./regress/x509/x509test.c: Merge with EOM 1.4
./dh.h: Merge with EOM 1.4
./math_ec2n.c: Merge with EOM 1.8
./crypto.c: Merge with EOM 1.25
./ike_quick_mode.c: Merge with EOM 1.82
./math_group.c: Merge with EOM 1.16
./math_ec2n.h: Merge with EOM 1.4
Style. alloc error reporting. Math error propagation. Allocate right
sizes.
Diffstat (limited to 'sbin/isakmpd/crypto.c')
| -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 229756ef4b6..0e14f4e33ab 100644 --- a/sbin/isakmpd/crypto.c +++ b/sbin/isakmpd/crypto.c @@ -1,5 +1,5 @@ -/* $OpenBSD: crypto.c,v 1.5 1999/04/05 21:00:27 niklas Exp $ */ -/* $EOM: crypto.c,v 1.24 1999/04/05 07:57:03 niklas Exp $ */ +/* $OpenBSD: crypto.c,v 1.6 1999/04/19 21:22:49 niklas Exp $ */ +/* $EOM: crypto.c,v 1.25 1999/04/17 23:20:21 niklas Exp $ */ /* * Copyright (c) 1998 Niels Provos. All rights reserved. @@ -59,22 +59,22 @@ void cast1_decrypt (struct keystate *, u_int8_t *, u_int16_t); struct crypto_xf transforms[] = { { - DES_CBC, "Data Encryption Standard (CBC-Mode)", 8, 8, BLOCKSIZE, NULL, + DES_CBC, "Data Encryption Standard (CBC-Mode)", 8, 8, BLOCKSIZE, 0, des1_init, des1_encrypt, des1_decrypt }, { - TRIPLEDES_CBC, "Triple-DES (CBC-Mode)", 24, 24, BLOCKSIZE, NULL, + TRIPLEDES_CBC, "Triple-DES (CBC-Mode)", 24, 24, BLOCKSIZE, 0, des3_init, des3_encrypt, des3_decrypt }, { - BLOWFISH_CBC, "Blowfish (CBC-Mode)", 12, 56, BLOCKSIZE, NULL, + BLOWFISH_CBC, "Blowfish (CBC-Mode)", 12, 56, BLOCKSIZE, 0, blf_init, blf_encrypt, blf_decrypt }, { - CAST_CBC, "CAST (CBC-Mode)", 12, 16, BLOCKSIZE, NULL, + CAST_CBC, "CAST (CBC-Mode)", 12, 16, BLOCKSIZE, 0, cast_init, cast1_encrypt, cast1_decrypt }, |