0a1,3
> /* $FreeBSD: head/sys/crypto/des/des.h 62587 2000-07-04 16:35:15Z itojun $ */
> /* $KAME: des.h,v 1.4 2000/06/14 10:41:17 itojun Exp $ */
>
46,47d48
< *
< * $FreeBSD: head/sys/crypto/des/des.h 55009 1999-12-22 19:13:38Z shin $
51c52
< #define HEADER_DES_H
---
> #define HEADER_DES_H
60c61
< #define DES_LONG unsigned long
---
> #define DES_LONG unsigned long
73c74
< #define _ ks._
---
> #define _ ks._
76,77c77,78
< #define DES_KEY_SZ (sizeof(des_cblock))
< #define DES_SCHEDULE_SZ (sizeof(des_key_schedule))
---
> #define DES_KEY_SZ (sizeof(des_cblock))
> #define DES_SCHEDULE_SZ (sizeof(des_key_schedule))
79,80c80,81
< #define DES_ENCRYPT 1
< #define DES_DECRYPT 0
---
> #define DES_ENCRYPT 1
> #define DES_DECRYPT 0
82,83c83,84
< #define DES_CBC_MODE 0
< #define DES_PCBC_MODE 1
---
> #define DES_CBC_MODE 0
> #define DES_PCBC_MODE 1
85c86
< #define des_ecb2_encrypt(i,o,k1,k2,e) \
---
> #define des_ecb2_encrypt(i,o,k1,k2,e) \
88c89
< #define des_ede2_cbc_encrypt(i,o,l,k1,k2,iv,e) \
---
> #define des_ede2_cbc_encrypt(i,o,l,k1,k2,iv,e) \
91c92
< #define des_ede2_cfb64_encrypt(i,o,l,k1,k2,iv,n,e) \
---
> #define des_ede2_cfb64_encrypt(i,o,l,k1,k2,iv,n,e) \
94c95
< #define des_ede2_ofb64_encrypt(i,o,l,k1,k2,iv,n) \
---
> #define des_ede2_ofb64_encrypt(i,o,l,k1,k2,iv,n) \
97,98c98,99
< #define C_Block des_cblock
< #define Key_schedule des_key_schedule
---
> #define C_Block des_cblock
> #define Key_schedule des_key_schedule
100,101c101,102
< #define ENCRYPT DES_ENCRYPT
< #define DECRYPT DES_DECRYPT
---
> #define ENCRYPT DES_ENCRYPT
> #define DECRYPT DES_DECRYPT
103,115c104,116
< #define KEY_SZ DES_KEY_SZ
< #define string_to_key des_string_to_key
< #define read_pw_string des_read_pw_string
< #define random_key des_random_key
< #define pcbc_encrypt des_pcbc_encrypt
< #define set_key des_set_key
< #define key_sched des_key_sched
< #define ecb_encrypt des_ecb_encrypt
< #define cbc_encrypt des_cbc_encrypt
< #define ncbc_encrypt des_ncbc_encrypt
< #define xcbc_encrypt des_xcbc_encrypt
< #define cbc_cksum des_cbc_cksum
< #define quad_cksum des_quad_cksum
---
> #define KEY_SZ DES_KEY_SZ
> #define string_to_key des_string_to_key
> #define read_pw_string des_read_pw_string
> #define random_key des_random_key
> #define pcbc_encrypt des_pcbc_encrypt
> #define set_key des_set_key
> #define key_sched des_key_sched
> #define ecb_encrypt des_ecb_encrypt
> #define cbc_encrypt des_cbc_encrypt
> #define ncbc_encrypt des_ncbc_encrypt
> #define xcbc_encrypt des_xcbc_encrypt
> #define cbc_cksum des_cbc_cksum
> #define quad_cksum des_quad_cksum
119,120c120,121
< #define des_fixup_key_parity des_set_odd_parity
< #define des_check_key_parity check_parity
---
> #define des_fixup_key_parity des_set_odd_parity
> #define des_check_key_parity check_parity
142c143
< void des_cbc_encrypt(struct mbuf *, size_t, size_t,
---
> int des_cbc_encrypt(struct mbuf *, size_t, size_t,
152c153
< extern void des_3cbc_process(struct mbuf *, size_t, size_t,
---
> extern int des_3cbc_process(struct mbuf *, size_t, size_t,