database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-27 12:41:57 +03:00
Code Activity

New pgindent run with fixes suggested by Tom. Patch manually reviewed,

Browse Source 
initdb/regression tests pass.
This commit is contained in:
Bruce Momjian
2001-11-05 17:46:40 +00:00
parent 34153b2052
commit ea08e6cd55
503 changed files with 1648 additions and 1610 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/pgcrypto/blf.c
View File

@ -48,7 +48,7 @@
#define inline __inline
#else /* !__GNUC__ */
#define inline
#endif /* !__GNUC__ */
#endif /* !__GNUC__ */
/* Function for Feistel Networks */

2
contrib/pgcrypto/blf.h
View File

@ -50,7 +50,7 @@ typedef struct BlowfishContext
{
uint32 S[4][256]; /* S-Boxes */
uint32 P[BLF_N + 2]; /* Subkeys */
} blf_ctx;
} blf_ctx;
/* Raw access to customized Blowfish
* blf_key is just:

2
contrib/pgcrypto/crypt-blowfish.c
View File

@ -61,7 +61,7 @@ typedef struct
{
BF_word S[4][0x100];
BF_key P;
} BF_ctx;
} BF_ctx;
/*
* Magic IV for 64 Blowfish encryptions that we do at the end.

2
contrib/pgcrypto/crypt-des.c
View File

@ -713,7 +713,7 @@ px_crypt_des(const char *key, const char *setting)
p = output + strlen(output);
}
else
#endif /* !DISABLE_XDES */
#endif /* !DISABLE_XDES */
{
/*
* "old"-style: setting - 2 bytes of salt key - up to 8 characters

6
contrib/pgcrypto/internal.c
View File

@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: internal.c,v 1.7 2001/10/28 06:25:41 momjian Exp $
* $Id: internal.c,v 1.8 2001/11/05 17:46:23 momjian Exp $
*/
@ -61,7 +61,7 @@ static struct int_digest
{
char *name;
void (*init) (PX_MD * h);
} int_digest_list[] =
} int_digest_list[] =
{
{
@ -520,7 +520,7 @@ static struct
{
char *name;
PX_Cipher *(*load) (void);
} int_ciphers[] =
} int_ciphers[] =
{
{

6
contrib/pgcrypto/md5.h
View File

@ -1,4 +1,4 @@
/* $Id: md5.h,v 1.6 2001/10/28 06:25:41 momjian Exp $ */
/* $Id: md5.h,v 1.7 2001/11/05 17:46:23 momjian Exp $ */
/* $KAME: md5.h,v 1.3 2000/02/22 14:01:18 itojun Exp $ */
/*
@ -59,7 +59,7 @@ typedef struct
unsigned int md5_i;
uint8 md5_buf[MD5_BUFLEN];
} md5_ctxt;
} md5_ctxt;
extern void md5_init(md5_ctxt *);
extern void md5_loop(md5_ctxt *, const uint8 *, unsigned int);
@ -76,4 +76,4 @@ do { \
md5_result((x), (y)); \
} while (0)
#endif /* ! _NETINET6_MD5_H_ */
#endif /* ! _NETINET6_MD5_H_ */

14
contrib/pgcrypto/openssl.c
View File

@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: openssl.c,v 1.7 2001/10/28 06:25:41 momjian Exp $
* $Id: openssl.c,v 1.8 2001/11/05 17:46:23 momjian Exp $
*/
#include <postgres.h>
@ -110,7 +110,7 @@ typedef struct
uint8 iv[EVP_MAX_IV_LENGTH];
uint klen;
uint init;
} ossldata;
} ossldata;
/* generic EVP */
@ -324,35 +324,35 @@ struct
{
char *name;
PX_Cipher cf;
} spec_types[] =
} spec_types[] =
{
{
"bf-cbc",
{
gen_evp_block_size, gen_evp_key_size, gen_evp_iv_size,
bf_init, bf_cbc_encrypt, bf_cbc_decrypt, gen_evp_free
bf_init, bf_cbc_encrypt, bf_cbc_decrypt, gen_evp_free
}
},
{
"bf-ecb",
{
gen_evp_block_size, gen_evp_key_size, gen_evp_iv_size,
bf_init, bf_ecb_encrypt, bf_ecb_decrypt, gen_evp_free
bf_init, bf_ecb_encrypt, bf_ecb_decrypt, gen_evp_free
}
},
{
"bf-cfb",
{
gen_evp_block_size, gen_evp_key_size, gen_evp_iv_size,
bf_init, bf_cfb64_encrypt, bf_cfb64_decrypt, gen_evp_free
bf_init, bf_cfb64_encrypt, bf_cfb64_decrypt, gen_evp_free
}
},
{
"bf-ofb",
{
gen_evp_block_size, gen_evp_key_size, gen_evp_iv_size,
bf_init, bf_ofb64_encrypt, bf_ofb64_decrypt, gen_evp_free
bf_init, bf_ofb64_encrypt, bf_ofb64_decrypt, gen_evp_free
}
},
{

4
contrib/pgcrypto/px-crypt.c
View File

@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: px-crypt.c,v 1.4 2001/10/28 06:25:41 momjian Exp $
* $Id: px-crypt.c,v 1.5 2001/11/05 17:46:23 momjian Exp $
*/
#include <postgres.h>
@ -75,7 +75,7 @@ static struct
unsigned id_len;
char *(*crypt) (const char *psw, const char *salt,
char *buf, unsigned len);
} px_crypt_list[] =
} px_crypt_list[] =
{
{

6
contrib/pgcrypto/px-crypt.h
View File

@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: px-crypt.h,v 1.4 2001/10/28 06:25:41 momjian Exp $
* $Id: px-crypt.h,v 1.5 2001/11/05 17:46:23 momjian Exp $
*/
#ifndef _PX_CRYPT_H
@ -88,6 +88,6 @@ char *px_crypt_des(const char *key, const char *setting);
/* crypt-md5.c */
char *px_crypt_md5(const char *pw, const char *salt,
char *dst, unsigned dstlen);
#endif /* !PX_SYSTEM_CRYPT */
#endif /* !PX_SYSTEM_CRYPT */
#endif /* _PX_CRYPT_H */
#endif /* _PX_CRYPT_H */

4
contrib/pgcrypto/px.h
View File

@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: px.h,v 1.3 2001/10/25 05:49:20 momjian Exp $
* $Id: px.h,v 1.4 2001/11/05 17:46:23 momjian Exp $
*/
#ifndef __PX_H
@ -180,4 +180,4 @@ const char *px_resolve_alias(const PX_Alias * aliases, const char *name);
(c)->decrypt(c, data, dlen, res, rlen)
#define px_combo_free(c) (c)->free(c)
#endif /* __PX_H */
#endif /* __PX_H */

8
contrib/pgcrypto/random.c
View File

@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: random.c,v 1.4 2001/10/28 06:25:41 momjian Exp $
* $Id: random.c,v 1.5 2001/11/05 17:46:23 momjian Exp $
*/
@ -77,7 +77,7 @@ px_get_random_bytes(uint8 *dst, unsigned count)
close(fd);
return res;
}
#endif /* RAND_DEV */
#endif /* RAND_DEV */
#ifdef RAND_SILLY
@ -90,7 +90,7 @@ px_get_random_bytes(uint8 *dst, unsigned count)
*dst++ = random();
return i;
}
#endif /* RAND_SILLY */
#endif /* RAND_SILLY */
#ifdef RAND_OPENSSL
@ -125,4 +125,4 @@ px_get_random_bytes(uint8 *dst, unsigned count)
return -1;
}
#endif /* RAND_OPENSSL */
#endif /* RAND_OPENSSL */

4
contrib/pgcrypto/rijndael.c
View File

@ -97,7 +97,7 @@ static u4byte il_tab[4][256];
#endif
static u4byte tab_gen = 0;
#endif /* !PRE_CALC_TABLES */
#endif /* !PRE_CALC_TABLES */
#define ff_mult(a,b) (a && b ? pow_tab[(log_tab[a] + log_tab[b]) % 255] : 0)
@ -251,7 +251,7 @@ gen_tabs(void)
}
tab_gen = 1;
#endif /* !PRE_CALC_TABLES */
#endif /* !PRE_CALC_TABLES */
}

4
contrib/pgcrypto/rijndael.h
View File

@ -33,7 +33,7 @@ typedef struct _rijndael_ctx
int decrypt;
u4byte e_key[64];
u4byte d_key[64];
} rijndael_ctx;
} rijndael_ctx;
/* 2. Standard interface for AES cryptographic routines */
@ -54,4 +54,4 @@ void aes_ecb_decrypt(rijndael_ctx * ctx, uint8 *data, unsigned len);
void aes_cbc_encrypt(rijndael_ctx * ctx, uint8 *iva, uint8 *data, unsigned len);
void aes_cbc_decrypt(rijndael_ctx * ctx, uint8 *iva, uint8 *data, unsigned len);
#endif /* _RIJNDAEL_H_ */
#endif /* _RIJNDAEL_H_ */

4
contrib/pgcrypto/sha1.c
View File

@ -1,4 +1,4 @@
/* $Id: sha1.c,v 1.9 2001/10/28 06:25:41 momjian Exp $ */
/* $Id: sha1.c,v 1.10 2001/11/05 17:46:23 momjian Exp $ */
/* $KAME: sha1.c,v 1.3 2000/02/22 14:01:18 itojun Exp $ */
/*
@ -346,4 +346,4 @@ sha1_result(struct sha1_ctxt * ctxt, uint8 *digest0)
#endif
}
#endif /* unsupported */
#endif /* unsupported */

4
contrib/pgcrypto/sha1.h
View File

@ -1,4 +1,4 @@
/* $Id: sha1.h,v 1.7 2001/10/28 06:25:41 momjian Exp $ */
/* $Id: sha1.h,v 1.8 2001/11/05 17:46:23 momjian Exp $ */
/* $KAME: sha1.h,v 1.4 2000/02/22 14:01:18 itojun Exp $ */
/*
@ -72,4 +72,4 @@ typedef struct sha1_ctxt SHA1_CTX;
#define SHA1_RESULTLEN (160/8)
#endif /* _NETINET6_SHA1_H_ */
#endif /* _NETINET6_SHA1_H_ */