Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 38a4c35

Browse files
committed
Persuade new pgcrypto stuff to compile.
1 parent ef80c87 commit 38a4c35

File tree

3 files changed

+18
-18
lines changed

3 files changed

+18
-18
lines changed

contrib/pgcrypto/blf.h

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -57,26 +57,26 @@ typedef struct BlowfishContext {
5757
* Blowfish_expand0state( state, key, keylen )
5858
*/
5959

60-
void Blowfish_encipher __P((blf_ctx *, uint32 *));
61-
void Blowfish_decipher __P((blf_ctx *, uint32 *));
62-
void Blowfish_initstate __P((blf_ctx *));
63-
void Blowfish_expand0state __P((blf_ctx *, const uint8 *, uint16));
60+
void Blowfish_encipher (blf_ctx *, uint32 *);
61+
void Blowfish_decipher (blf_ctx *, uint32 *);
62+
void Blowfish_initstate (blf_ctx *);
63+
void Blowfish_expand0state (blf_ctx *, const uint8 *, uint16);
6464
void Blowfish_expandstate
65-
__P((blf_ctx *, const uint8 *, uint16, const uint8 *, uint16));
65+
(blf_ctx *, const uint8 *, uint16, const uint8 *, uint16);
6666

6767
/* Standard Blowfish */
6868

69-
void blf_key __P((blf_ctx *, const uint8 *, uint16));
70-
void blf_enc __P((blf_ctx *, uint32 *, uint16));
71-
void blf_dec __P((blf_ctx *, uint32 *, uint16));
69+
void blf_key (blf_ctx *, const uint8 *, uint16);
70+
void blf_enc (blf_ctx *, uint32 *, uint16);
71+
void blf_dec (blf_ctx *, uint32 *, uint16);
7272

7373
/* Converts uint8 to uint32 */
74-
uint32 Blowfish_stream2word __P((const uint8 *, uint16 ,
75-
uint16 *));
74+
uint32 Blowfish_stream2word (const uint8 *, uint16, uint16 *);
7675

77-
void blf_ecb_encrypt __P((blf_ctx *, uint8 *, uint32));
78-
void blf_ecb_decrypt __P((blf_ctx *, uint8 *, uint32));
76+
void blf_ecb_encrypt (blf_ctx *, uint8 *, uint32);
77+
void blf_ecb_decrypt (blf_ctx *, uint8 *, uint32);
78+
79+
void blf_cbc_encrypt (blf_ctx *, uint8 *, uint8 *, uint32);
80+
void blf_cbc_decrypt (blf_ctx *, uint8 *, uint8 *, uint32);
7981

80-
void blf_cbc_encrypt __P((blf_ctx *, uint8 *, uint8 *, uint32));
81-
void blf_cbc_decrypt __P((blf_ctx *, uint8 *, uint8 *, uint32));
8282
#endif

contrib/pgcrypto/rijndael.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ Mean: 500 cycles = 51.2 mbits/sec
4545
#define PRE_CALC_TABLES
4646
#define LARGE_TABLES
4747

48-
static void gen_tabs __P((void));
48+
static void gen_tabs(void);
4949

5050
/* 3. Basic macros for speeding up generic operations */
5151

contrib/pgcrypto/rijndael.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@ typedef struct _rijndael_ctx {
4141
/* require endian conversions for big-endian architectures */
4242

4343
rijndael_ctx *
44-
rijndael_set_key __P((rijndael_ctx *, const u4byte *, const u4byte, int));
45-
void rijndael_encrypt __P((rijndael_ctx *, const u4byte *, u4byte *));
46-
void rijndael_decrypt __P((rijndael_ctx *, const u4byte *, u4byte *));
44+
rijndael_set_key (rijndael_ctx *, const u4byte *, const u4byte, int);
45+
void rijndael_encrypt (rijndael_ctx *, const u4byte *, u4byte *);
46+
void rijndael_decrypt (rijndael_ctx *, const u4byte *, u4byte *);
4747

4848
/* conventional interface */
4949

0 commit comments

Comments
 (0)