mirror of
https://git.postgresql.org/git/postgresql.git
synced 2024-12-21 08:29:39 +08:00
c7b8998ebb
Change pg_bsd_indent to follow upstream rules for placement of comments
to the right of code, and remove pgindent hack that caused comments
following #endif to not obey the general rule.
Commit e3860ffa4d wasn't actually using
the published version of pg_bsd_indent, but a hacked-up version that
tried to minimize the amount of movement of comments to the right of
code. The situation of interest is where such a comment has to be
moved to the right of its default placement at column 33 because there's
code there. BSD indent has always moved right in units of tab stops
in such cases --- but in the previous incarnation, indent was working
in 8-space tab stops, while now it knows we use 4-space tabs. So the
net result is that in about half the cases, such comments are placed
one tab stop left of before. This is better all around: it leaves
more room on the line for comment text, and it means that in such
cases the comment uniformly starts at the next 4-space tab stop after
the code, rather than sometimes one and sometimes two tabs after.
Also, ensure that comments following #endif are indented the same
as comments following other preprocessor commands such as #else.
That inconsistency turns out to have been self-inflicted damage
from a poorly-thought-through post-indent "fixup" in pgindent.
This patch is much less interesting than the first round of indent
changes, but also bulkier, so I thought it best to separate the effects.
Discussion: https://postgr.es/m/E1dAmxK-0006EE-1r@gemulon.postgresql.org
Discussion: https://postgr.es/m/30527.1495162840@sss.pgh.pa.us
60 lines
2.2 KiB
C
60 lines
2.2 KiB
C
/*
|
|
* contrib/pgcrypto/rijndael.h
|
|
*
|
|
* $OpenBSD: rijndael.h,v 1.3 2001/05/09 23:01:32 markus Exp $ */
|
|
|
|
/* This is an independent implementation of the encryption algorithm: */
|
|
/* */
|
|
/* RIJNDAEL by Joan Daemen and Vincent Rijmen */
|
|
/* */
|
|
/* which is a candidate algorithm in the Advanced Encryption Standard */
|
|
/* programme of the US National Institute of Standards and Technology. */
|
|
/* */
|
|
/* Copyright in this implementation is held by Dr B R Gladman but I */
|
|
/* hereby give permission for its free direct or derivative use subject */
|
|
/* to acknowledgment of its origin and compliance with any conditions */
|
|
/* that the originators of the algorithm place on its exploitation. */
|
|
/* */
|
|
/* Dr Brian Gladman (gladman@seven77.demon.co.uk) 14th January 1999 */
|
|
|
|
#ifndef _RIJNDAEL_H_
|
|
#define _RIJNDAEL_H_
|
|
|
|
/* 1. Standard types for AES cryptography source code */
|
|
|
|
typedef uint8 u1byte; /* an 8 bit unsigned character type */
|
|
typedef uint16 u2byte; /* a 16 bit unsigned integer type */
|
|
typedef uint32 u4byte; /* a 32 bit unsigned integer type */
|
|
|
|
typedef int8 s1byte; /* an 8 bit signed character type */
|
|
typedef int16 s2byte; /* a 16 bit signed integer type */
|
|
typedef int32 s4byte; /* a 32 bit signed integer type */
|
|
|
|
typedef struct _rijndael_ctx
|
|
{
|
|
u4byte k_len;
|
|
int decrypt;
|
|
u4byte e_key[64];
|
|
u4byte d_key[64];
|
|
} rijndael_ctx;
|
|
|
|
|
|
/* 2. Standard interface for AES cryptographic routines */
|
|
|
|
/* These are all based on 32 bit unsigned values and will therefore */
|
|
/* require endian conversions for big-endian architectures */
|
|
|
|
rijndael_ctx *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 */
|
|
|
|
void aes_set_key(rijndael_ctx *ctx, const uint8 *key, unsigned keybits, int enc);
|
|
void aes_ecb_encrypt(rijndael_ctx *ctx, uint8 *data, unsigned len);
|
|
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_ */
|