From 38a4c3511695c21be936c0c278daf9a67ec12b2c Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Wed, 22 Aug 2001 18:19:59 +0000 Subject: [PATCH] Persuade new pgcrypto stuff to compile. --- contrib/pgcrypto/blf.h | 28 ++++++++++++++-------------- contrib/pgcrypto/rijndael.c | 2 +- contrib/pgcrypto/rijndael.h | 6 +++--- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/contrib/pgcrypto/blf.h b/contrib/pgcrypto/blf.h index bb6b66ff27..daf9703b77 100644 --- a/contrib/pgcrypto/blf.h +++ b/contrib/pgcrypto/blf.h @@ -57,26 +57,26 @@ typedef struct BlowfishContext { * Blowfish_expand0state( state, key, keylen ) */ -void Blowfish_encipher __P((blf_ctx *, uint32 *)); -void Blowfish_decipher __P((blf_ctx *, uint32 *)); -void Blowfish_initstate __P((blf_ctx *)); -void Blowfish_expand0state __P((blf_ctx *, const uint8 *, uint16)); +void Blowfish_encipher (blf_ctx *, uint32 *); +void Blowfish_decipher (blf_ctx *, uint32 *); +void Blowfish_initstate (blf_ctx *); +void Blowfish_expand0state (blf_ctx *, const uint8 *, uint16); void Blowfish_expandstate - __P((blf_ctx *, const uint8 *, uint16, const uint8 *, uint16)); + (blf_ctx *, const uint8 *, uint16, const uint8 *, uint16); /* Standard Blowfish */ -void blf_key __P((blf_ctx *, const uint8 *, uint16)); -void blf_enc __P((blf_ctx *, uint32 *, uint16)); -void blf_dec __P((blf_ctx *, uint32 *, uint16)); +void blf_key (blf_ctx *, const uint8 *, uint16); +void blf_enc (blf_ctx *, uint32 *, uint16); +void blf_dec (blf_ctx *, uint32 *, uint16); /* Converts uint8 to uint32 */ -uint32 Blowfish_stream2word __P((const uint8 *, uint16 , - uint16 *)); +uint32 Blowfish_stream2word (const uint8 *, uint16, uint16 *); -void blf_ecb_encrypt __P((blf_ctx *, uint8 *, uint32)); -void blf_ecb_decrypt __P((blf_ctx *, uint8 *, uint32)); +void blf_ecb_encrypt (blf_ctx *, uint8 *, uint32); +void blf_ecb_decrypt (blf_ctx *, uint8 *, uint32); + +void blf_cbc_encrypt (blf_ctx *, uint8 *, uint8 *, uint32); +void blf_cbc_decrypt (blf_ctx *, uint8 *, uint8 *, uint32); -void blf_cbc_encrypt __P((blf_ctx *, uint8 *, uint8 *, uint32)); -void blf_cbc_decrypt __P((blf_ctx *, uint8 *, uint8 *, uint32)); #endif diff --git a/contrib/pgcrypto/rijndael.c b/contrib/pgcrypto/rijndael.c index e4cb6d732e..15a88aaf3b 100644 --- a/contrib/pgcrypto/rijndael.c +++ b/contrib/pgcrypto/rijndael.c @@ -45,7 +45,7 @@ Mean: 500 cycles = 51.2 mbits/sec #define PRE_CALC_TABLES #define LARGE_TABLES -static void gen_tabs __P((void)); +static void gen_tabs(void); /* 3. Basic macros for speeding up generic operations */ diff --git a/contrib/pgcrypto/rijndael.h b/contrib/pgcrypto/rijndael.h index 9d9587760c..bdefda828f 100644 --- a/contrib/pgcrypto/rijndael.h +++ b/contrib/pgcrypto/rijndael.h @@ -41,9 +41,9 @@ typedef struct _rijndael_ctx { /* require endian conversions for big-endian architectures */ rijndael_ctx * -rijndael_set_key __P((rijndael_ctx *, const u4byte *, const u4byte, int)); -void rijndael_encrypt __P((rijndael_ctx *, const u4byte *, u4byte *)); -void rijndael_decrypt __P((rijndael_ctx *, const u4byte *, u4byte *)); +rijndael_set_key (rijndael_ctx *, const u4byte *, const u4byte, int); +void rijndael_encrypt (rijndael_ctx *, const u4byte *, u4byte *); +void rijndael_decrypt (rijndael_ctx *, const u4byte *, u4byte *); /* conventional interface */ -- 2.40.0