From a6236b1a307035019bba109099f351c4ab45ebf9 Mon Sep 17 00:00:00 2001 From: Robert Garrett Date: Wed, 27 Aug 2003 10:59:04 +0000 Subject: [PATCH] remove old ___P() prototypes --- sys/crypto/blowfish/blowfish.h | 8 +++---- sys/crypto/cast128/cast128.h | 20 ++++++++-------- sys/crypto/des/des.h | 44 +++++++++++++++++----------------- sys/crypto/md5.c | 4 ++-- sys/crypto/md5.h | 10 ++++---- sys/crypto/sha1.c | 4 ++-- sys/crypto/sha1.h | 10 ++++---- sys/crypto/sha2/sha2.h | 36 ++++++++++++++-------------- 8 files changed, 68 insertions(+), 68 deletions(-) diff --git a/sys/crypto/blowfish/blowfish.h b/sys/crypto/blowfish/blowfish.h index c971a7fcf1..3b23260c1c 100644 --- a/sys/crypto/blowfish/blowfish.h +++ b/sys/crypto/blowfish/blowfish.h @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/crypto/blowfish/blowfish.h,v 1.1.2.3 2002/03/26 10:12:23 ume Exp $ */ -/* $DragonFly: src/sys/crypto/blowfish/blowfish.h,v 1.2 2003/06/17 04:28:20 dillon Exp $ */ +/* $DragonFly: src/sys/crypto/blowfish/blowfish.h,v 1.3 2003/08/27 10:59:04 rob Exp $ */ /* $KAME: blowfish.h,v 1.12 2002/02/27 01:33:59 itojun Exp $ */ /* crypto/bf/blowfish.h */ @@ -81,9 +81,9 @@ typedef struct bf_key_st { BF_LONG S[4*256]; } BF_KEY; -void BF_set_key __P((BF_KEY *, int, unsigned char *)); -void BF_encrypt __P((BF_LONG *, BF_KEY *)); -void BF_decrypt __P((BF_LONG *, BF_KEY *)); +void BF_set_key (BF_KEY *, int, unsigned char *); +void BF_encrypt (BF_LONG *, BF_KEY *); +void BF_decrypt (BF_LONG *, BF_KEY *); void BF_cbc_encrypt(const unsigned char *, unsigned char *, long, const BF_KEY *, unsigned char *, int); diff --git a/sys/crypto/cast128/cast128.h b/sys/crypto/cast128/cast128.h index b9f119726e..b43e5d4148 100644 --- a/sys/crypto/cast128/cast128.h +++ b/sys/crypto/cast128/cast128.h @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/crypto/cast128/cast128.h,v 1.1.2.3 2001/12/05 05:54:57 ume Exp $ */ -/* $DragonFly: src/sys/crypto/cast128/cast128.h,v 1.2 2003/06/17 04:28:20 dillon Exp $ */ +/* $DragonFly: src/sys/crypto/cast128/cast128.h,v 1.3 2003/08/27 10:59:04 rob Exp $ */ /* $KAME: cast128.h,v 1.7 2001/11/27 09:47:32 sakane Exp $ */ /* @@ -47,14 +47,14 @@ #define CAST128_DECRYPT 0 -extern void set_cast128_subkey __P((u_int32_t *, u_int8_t *, int)); -extern void cast128_encrypt_round16 __P((u_int8_t *, const u_int8_t *, - u_int32_t *)); -extern void cast128_decrypt_round16 __P((u_int8_t *, const u_int8_t *, - u_int32_t *)); -extern void cast128_encrypt_round12 __P((u_int8_t *, const u_int8_t *, - u_int32_t *)); -extern void cast128_decrypt_round12 __P((u_int8_t *, const u_int8_t *, - u_int32_t *)); +extern void set_cast128_subkey (u_int32_t *, u_int8_t *, int); +extern void cast128_encrypt_round16 (u_int8_t *, const u_int8_t *, + u_int32_t *); +extern void cast128_decrypt_round16 (u_int8_t *, const u_int8_t *, + u_int32_t *); +extern void cast128_encrypt_round12 (u_int8_t *, const u_int8_t *, + u_int32_t *); +extern void cast128_decrypt_round12 (u_int8_t *, const u_int8_t *, + u_int32_t *); #endif diff --git a/sys/crypto/des/des.h b/sys/crypto/des/des.h index fa16d5a278..99a4778061 100644 --- a/sys/crypto/des/des.h +++ b/sys/crypto/des/des.h @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/crypto/des/des.h,v 1.1.2.3 2002/03/26 10:12:24 ume Exp $ */ -/* $DragonFly: src/sys/crypto/des/des.h,v 1.2 2003/06/17 04:28:20 dillon Exp $ */ +/* $DragonFly: src/sys/crypto/des/des.h,v 1.3 2003/08/27 10:59:04 rob Exp $ */ /* $KAME: des.h,v 1.8 2001/09/10 04:03:57 itojun Exp $ */ /* lib/des/des.h */ @@ -82,35 +82,35 @@ typedef struct des_ks_struct extern int des_check_key; /* defaults to false */ -char *des_options __P((void)); -void des_ecb_encrypt __P((des_cblock *, des_cblock *, - des_key_schedule, int)); +char *des_options (void); +void des_ecb_encrypt (des_cblock *, des_cblock *, + des_key_schedule, int); -void des_encrypt1 __P((DES_LONG *, des_key_schedule, int)); -void des_encrypt2 __P((DES_LONG *, des_key_schedule, int)); -void des_encrypt3 __P((DES_LONG *, des_key_schedule, des_key_schedule, - des_key_schedule)); -void des_decrypt3 __P((DES_LONG *, des_key_schedule, des_key_schedule, - des_key_schedule)); +void des_encrypt1 (DES_LONG *, des_key_schedule, int); +void des_encrypt2 (DES_LONG *, des_key_schedule, int); +void des_encrypt3 (DES_LONG *, des_key_schedule, des_key_schedule, + des_key_schedule); +void des_decrypt3 (DES_LONG *, des_key_schedule, des_key_schedule, + des_key_schedule); -void des_ecb3_encrypt __P((des_cblock *, des_cblock *, des_key_schedule, - des_key_schedule, des_key_schedule, int)); +void des_ecb3_encrypt (des_cblock *, des_cblock *, des_key_schedule, + des_key_schedule, des_key_schedule, int); -void des_ncbc_encrypt __P((const unsigned char *, unsigned char *, long, - des_key_schedule, des_cblock *, int)); +void des_ncbc_encrypt (const unsigned char *, unsigned char *, long, + des_key_schedule, des_cblock *, int); void des_ede3_cbc_encrypt(const unsigned char *, unsigned char *, long, des_key_schedule, des_key_schedule, des_key_schedule, des_cblock *, int); -void des_set_odd_parity __P((des_cblock *)); -void des_fixup_key_parity __P((des_cblock *)); -int des_is_weak_key __P((des_cblock *)); -int des_set_key __P((des_cblock *, des_key_schedule)); -int des_key_sched __P((des_cblock *, des_key_schedule)); -int des_set_key_checked __P((des_cblock *, des_key_schedule)); -void des_set_key_unchecked __P((des_cblock *, des_key_schedule)); -int des_check_key_parity __P((des_cblock *)); +void des_set_odd_parity (des_cblock *); +void des_fixup_key_parity (des_cblock *); +int des_is_weak_key (des_cblock *); +int des_set_key (des_cblock *, des_key_schedule); +int des_key_sched (des_cblock *, des_key_schedule); +int des_set_key_checked (des_cblock *, des_key_schedule); +void des_set_key_unchecked (des_cblock *, des_key_schedule); +int des_check_key_parity (des_cblock *); #ifdef __cplusplus } diff --git a/sys/crypto/md5.c b/sys/crypto/md5.c index e553195cc3..6a28fdeb48 100644 --- a/sys/crypto/md5.c +++ b/sys/crypto/md5.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/crypto/md5.c,v 1.1.2.2 2001/07/03 11:01:27 ume Exp $ */ -/* $DragonFly: src/sys/crypto/md5.c,v 1.2 2003/06/17 04:28:20 dillon Exp $ */ +/* $DragonFly: src/sys/crypto/md5.c,v 1.3 2003/08/27 10:59:04 rob Exp $ */ /* $KAME: md5.c,v 1.5 2000/11/08 06:13:08 itojun Exp $ */ /* @@ -128,7 +128,7 @@ static const u_int8_t md5_paddat[MD5_BUFLEN] = { 0, 0, 0, 0, 0, 0, 0, 0, }; -static void md5_calc __P((u_int8_t *, md5_ctxt *)); +static void md5_calc (u_int8_t *, md5_ctxt *); void md5_init(ctxt) md5_ctxt *ctxt; diff --git a/sys/crypto/md5.h b/sys/crypto/md5.h index 93dbe6028c..8c3d1e2f20 100644 --- a/sys/crypto/md5.h +++ b/sys/crypto/md5.h @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/crypto/md5.h,v 1.1.2.1 2000/07/15 07:14:18 kris Exp $ */ -/* $DragonFly: src/sys/crypto/md5.h,v 1.2 2003/06/17 04:28:20 dillon Exp $ */ +/* $DragonFly: src/sys/crypto/md5.h,v 1.3 2003/08/27 10:59:04 rob Exp $ */ /* $KAME: md5.h,v 1.4 2000/03/27 04:36:22 sumikawa Exp $ */ /* @@ -59,10 +59,10 @@ typedef struct { u_int8_t md5_buf[MD5_BUFLEN]; } md5_ctxt; -extern void md5_init __P((md5_ctxt *)); -extern void md5_loop __P((md5_ctxt *, u_int8_t *, u_int)); -extern void md5_pad __P((md5_ctxt *)); -extern void md5_result __P((u_int8_t *, md5_ctxt *)); +extern void md5_init (md5_ctxt *); +extern void md5_loop (md5_ctxt *, u_int8_t *, u_int); +extern void md5_pad (md5_ctxt *); +extern void md5_result (u_int8_t *, md5_ctxt *); /* compatibility */ #define MD5_CTX md5_ctxt diff --git a/sys/crypto/sha1.c b/sys/crypto/sha1.c index fbdf2552b8..adc4c4513e 100644 --- a/sys/crypto/sha1.c +++ b/sys/crypto/sha1.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/crypto/sha1.c,v 1.2.2.4 2001/07/03 11:01:27 ume Exp $ */ -/* $DragonFly: src/sys/crypto/sha1.c,v 1.2 2003/06/17 04:28:20 dillon Exp $ */ +/* $DragonFly: src/sys/crypto/sha1.c,v 1.3 2003/08/27 10:59:04 rob Exp $ */ /* $KAME: sha1.c,v 1.5 2000/11/08 06:13:08 itojun Exp $ */ /* @@ -85,7 +85,7 @@ static u_int32_t _K[] = { 0x5a827999, 0x6ed9eba1, 0x8f1bbcdc, 0xca62c1d6 }; sha1_step(ctxt); \ } -static void sha1_step __P((struct sha1_ctxt *)); +static void sha1_step (struct sha1_ctxt *); static void sha1_step(ctxt) diff --git a/sys/crypto/sha1.h b/sys/crypto/sha1.h index 7a38c52aa5..118f370754 100644 --- a/sys/crypto/sha1.h +++ b/sys/crypto/sha1.h @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/crypto/sha1.h,v 1.3.2.3 2000/10/12 18:59:31 archie Exp $ */ -/* $DragonFly: src/sys/crypto/sha1.h,v 1.2 2003/06/17 04:28:20 dillon Exp $ */ +/* $DragonFly: src/sys/crypto/sha1.h,v 1.3 2003/08/27 10:59:04 rob Exp $ */ /* $KAME: sha1.h,v 1.5 2000/03/27 04:36:23 sumikawa Exp $ */ /* @@ -56,10 +56,10 @@ struct sha1_ctxt { }; #ifdef _KERNEL -extern void sha1_init __P((struct sha1_ctxt *)); -extern void sha1_pad __P((struct sha1_ctxt *)); -extern void sha1_loop __P((struct sha1_ctxt *, const u_int8_t *, size_t)); -extern void sha1_result __P((struct sha1_ctxt *, caddr_t)); +extern void sha1_init (struct sha1_ctxt *); +extern void sha1_pad (struct sha1_ctxt *); +extern void sha1_loop (struct sha1_ctxt *, const u_int8_t *, size_t); +extern void sha1_result (struct sha1_ctxt *, caddr_t); /* compatibilty with other SHA1 source codes */ typedef struct sha1_ctxt SHA1_CTX; diff --git a/sys/crypto/sha2/sha2.h b/sys/crypto/sha2/sha2.h index cd14a6b605..ef348cec26 100644 --- a/sys/crypto/sha2/sha2.h +++ b/sys/crypto/sha2/sha2.h @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/crypto/sha2/sha2.h,v 1.1.2.1 2001/07/03 11:01:36 ume Exp $ */ -/* $DragonFly: src/sys/crypto/sha2/sha2.h,v 1.2 2003/06/17 04:28:20 dillon Exp $ */ +/* $DragonFly: src/sys/crypto/sha2/sha2.h,v 1.3 2003/08/27 10:59:04 rob Exp $ */ /* $KAME: sha2.h,v 1.3 2001/03/12 08:27:48 itojun Exp $ */ /* @@ -116,23 +116,23 @@ typedef SHA512_CTX SHA384_CTX; /*** SHA-256/384/512 Function Prototypes ******************************/ -void SHA256_Init __P((SHA256_CTX *)); -void SHA256_Update __P((SHA256_CTX*, const u_int8_t*, size_t)); -void SHA256_Final __P((u_int8_t[SHA256_DIGEST_LENGTH], SHA256_CTX*)); -char* SHA256_End __P((SHA256_CTX*, char[SHA256_DIGEST_STRING_LENGTH])); -char* SHA256_Data __P((const u_int8_t*, size_t, char[SHA256_DIGEST_STRING_LENGTH])); - -void SHA384_Init __P((SHA384_CTX*)); -void SHA384_Update __P((SHA384_CTX*, const u_int8_t*, size_t)); -void SHA384_Final __P((u_int8_t[SHA384_DIGEST_LENGTH], SHA384_CTX*)); -char* SHA384_End __P((SHA384_CTX*, char[SHA384_DIGEST_STRING_LENGTH])); -char* SHA384_Data __P((const u_int8_t*, size_t, char[SHA384_DIGEST_STRING_LENGTH])); - -void SHA512_Init __P((SHA512_CTX*)); -void SHA512_Update __P((SHA512_CTX*, const u_int8_t*, size_t)); -void SHA512_Final __P((u_int8_t[SHA512_DIGEST_LENGTH], SHA512_CTX*)); -char* SHA512_End __P((SHA512_CTX*, char[SHA512_DIGEST_STRING_LENGTH])); -char* SHA512_Data __P((const u_int8_t*, size_t, char[SHA512_DIGEST_STRING_LENGTH])); +void SHA256_Init (SHA256_CTX *); +void SHA256_Update (SHA256_CTX*, const u_int8_t*, size_t); +void SHA256_Final (u_int8_t[SHA256_DIGEST_LENGTH], SHA256_CTX*); +char* SHA256_End (SHA256_CTX*, char[SHA256_DIGEST_STRING_LENGTH]); +char* SHA256_Data (const u_int8_t*, size_t, char[SHA256_DIGEST_STRING_LENGTH]); + +void SHA384_Init (SHA384_CTX*); +void SHA384_Update (SHA384_CTX*, const u_int8_t*, size_t); +void SHA384_Final (u_int8_t[SHA384_DIGEST_LENGTH], SHA384_CTX*); +char* SHA384_End (SHA384_CTX*, char[SHA384_DIGEST_STRING_LENGTH]); +char* SHA384_Data (const u_int8_t*, size_t, char[SHA384_DIGEST_STRING_LENGTH]); + +void SHA512_Init (SHA512_CTX*); +void SHA512_Update (SHA512_CTX*, const u_int8_t*, size_t); +void SHA512_Final (u_int8_t[SHA512_DIGEST_LENGTH], SHA512_CTX*); +char* SHA512_End (SHA512_CTX*, char[SHA512_DIGEST_STRING_LENGTH]); +char* SHA512_Data (const u_int8_t*, size_t, char[SHA512_DIGEST_STRING_LENGTH]); #ifdef __cplusplus } -- 2.41.0