diff options
| author | Angelos D. Keromytis <angelos@cvs.openbsd.org> | 2001-06-13 13:43:36 +0000 |
|---|---|---|
| committer | Angelos D. Keromytis <angelos@cvs.openbsd.org> | 2001-06-13 13:43:36 +0000 |
| commit | a39deb81356626a2d4892e9e1e72b74f1e13e2ae (patch) | |
| tree | 7a388b664b0954b4c6d2341ae362a372ffc5fcaa | |
| parent | ed5df046664e7a30ab18b240dffa816edd709a43 (diff) | |
ivmask has been deprecated.
| -rw-r--r-- | sys/crypto/xform.c | 14 | ||||
| -rw-r--r-- | sys/crypto/xform.h | 3 |
2 files changed, 8 insertions, 9 deletions
diff --git a/sys/crypto/xform.c b/sys/crypto/xform.c index ff62cf8dfc1..c18901c64b5 100644 --- a/sys/crypto/xform.c +++ b/sys/crypto/xform.c @@ -1,4 +1,4 @@ -/* $OpenBSD: xform.c,v 1.5 2001/05/05 00:31:34 angelos Exp $ */ +/* $OpenBSD: xform.c,v 1.6 2001/06/13 13:43:34 angelos Exp $ */ /* * The authors of this code are John Ioannidis (ji@tla.org), @@ -91,7 +91,7 @@ int RMD160Update_int(void *, u_int8_t *, u_int16_t); struct enc_xform enc_xform_des = { CRYPTO_DES_CBC, "DES", - 8, 8, 8, 8, + 8, 8, 8, des1_encrypt, des1_decrypt, des1_setkey, @@ -101,7 +101,7 @@ struct enc_xform enc_xform_des = struct enc_xform enc_xform_3des = { CRYPTO_3DES_CBC, "3DES", - 8, 24, 24, 8, + 8, 24, 24, des3_encrypt, des3_decrypt, des3_setkey, @@ -111,7 +111,7 @@ struct enc_xform enc_xform_3des = struct enc_xform enc_xform_blf = { CRYPTO_BLF_CBC, "Blowfish", - 8, 5, 56 /* 448 bits, max key */, 8, + 8, 5, 56 /* 448 bits, max key */, blf_encrypt, blf_decrypt, blf_setkey, @@ -121,7 +121,7 @@ struct enc_xform enc_xform_blf = struct enc_xform enc_xform_cast5 = { CRYPTO_CAST_CBC, "CAST-128", - 8, 5, 16, 8, + 8, 5, 16, cast5_encrypt, cast5_decrypt, cast5_setkey, @@ -131,7 +131,7 @@ struct enc_xform enc_xform_cast5 = struct enc_xform enc_xform_skipjack = { CRYPTO_SKIPJACK_CBC, "Skipjack", - 8, 10, 10, 8, + 8, 10, 10, skipjack_encrypt, skipjack_decrypt, skipjack_setkey, @@ -141,7 +141,7 @@ struct enc_xform enc_xform_skipjack = struct enc_xform enc_xform_rijndael128 = { CRYPTO_RIJNDAEL128_CBC, "Rijndael-128/AES", - 16, 8, 32, 16, + 16, 8, 32, rijndael128_encrypt, rijndael128_decrypt, rijndael128_setkey, diff --git a/sys/crypto/xform.h b/sys/crypto/xform.h index 821bb267743..dc86f5788e0 100644 --- a/sys/crypto/xform.h +++ b/sys/crypto/xform.h @@ -1,4 +1,4 @@ -/* $OpenBSD: xform.h,v 1.3 2001/05/13 16:52:33 jason Exp $ */ +/* $OpenBSD: xform.h,v 1.4 2001/06/13 13:43:35 angelos Exp $ */ /* * The author of this code is Angelos D. Keromytis (angelos@cis.upenn.edu) @@ -48,7 +48,6 @@ struct enc_xform char *name; u_int16_t blocksize; u_int16_t minkey, maxkey; - u_int32_t ivmask; /* Or all possible modes, zero iv = 1 */ void (*encrypt) (caddr_t, u_int8_t *); void (*decrypt) (caddr_t, u_int8_t *); void (*setkey) (u_int8_t **, u_int8_t *, int len); |