mirror of
https://github.com/postgres/postgres.git
synced 2025-07-27 12:41:57 +03:00
pgindent run for 8.3.
This commit is contained in:
@ -26,7 +26,7 @@
|
||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* $PostgreSQL: pgsql/contrib/pgcrypto/openssl.c,v 1.31 2007/09/29 02:18:15 tgl Exp $
|
||||
* $PostgreSQL: pgsql/contrib/pgcrypto/openssl.c,v 1.32 2007/11/15 21:14:31 momjian Exp $
|
||||
*/
|
||||
|
||||
#include "postgres.h"
|
||||
@ -98,10 +98,13 @@ static void
|
||||
AES_cbc_encrypt(const uint8 *src, uint8 *dst, int len, AES_KEY *ctx, uint8 *iv, int enc)
|
||||
{
|
||||
memcpy(dst, src, len);
|
||||
if (enc) {
|
||||
if (enc)
|
||||
{
|
||||
aes_cbc_encrypt(ctx, iv, dst, len);
|
||||
memcpy(iv, dst + len - 16, 16);
|
||||
} else {
|
||||
}
|
||||
else
|
||||
{
|
||||
aes_cbc_decrypt(ctx, iv, dst, len);
|
||||
memcpy(iv, src + len - 16, 16);
|
||||
}
|
||||
@ -394,26 +397,27 @@ static int
|
||||
bf_check_supported_key_len(void)
|
||||
{
|
||||
static const uint8 key[56] = {
|
||||
0xf0,0xe1,0xd2,0xc3,0xb4,0xa5,0x96,0x87,0x78,0x69,
|
||||
0x5a,0x4b,0x3c,0x2d,0x1e,0x0f,0x00,0x11,0x22,0x33,
|
||||
0x44,0x55,0x66,0x77,0x04,0x68,0x91,0x04,0xc2,0xfd,
|
||||
0x3b,0x2f,0x58,0x40,0x23,0x64,0x1a,0xba,0x61,0x76,
|
||||
0x1f,0x1f,0x1f,0x1f,0x0e,0x0e,0x0e,0x0e,0xff,0xff,
|
||||
0xff,0xff,0xff,0xff,0xff,0xff
|
||||
0xf0, 0xe1, 0xd2, 0xc3, 0xb4, 0xa5, 0x96, 0x87, 0x78, 0x69,
|
||||
0x5a, 0x4b, 0x3c, 0x2d, 0x1e, 0x0f, 0x00, 0x11, 0x22, 0x33,
|
||||
0x44, 0x55, 0x66, 0x77, 0x04, 0x68, 0x91, 0x04, 0xc2, 0xfd,
|
||||
0x3b, 0x2f, 0x58, 0x40, 0x23, 0x64, 0x1a, 0xba, 0x61, 0x76,
|
||||
0x1f, 0x1f, 0x1f, 0x1f, 0x0e, 0x0e, 0x0e, 0x0e, 0xff, 0xff,
|
||||
0xff, 0xff, 0xff, 0xff, 0xff, 0xff
|
||||
};
|
||||
|
||||
static const uint8 data[8] = {0xfe,0xdc,0xba,0x98,0x76,0x54,0x32,0x10};
|
||||
static const uint8 res[8] = {0xc0,0x45,0x04,0x01,0x2e,0x4e,0x1f,0x53};
|
||||
static const uint8 data[8] = {0xfe, 0xdc, 0xba, 0x98, 0x76, 0x54, 0x32, 0x10};
|
||||
static const uint8 res[8] = {0xc0, 0x45, 0x04, 0x01, 0x2e, 0x4e, 0x1f, 0x53};
|
||||
static uint8 out[8];
|
||||
|
||||
BF_KEY bf_key;
|
||||
BF_KEY bf_key;
|
||||
|
||||
/* encrypt with 448bits key and verify output */
|
||||
BF_set_key(&bf_key, 56, key);
|
||||
BF_ecb_encrypt(data, out, &bf_key, BF_ENCRYPT);
|
||||
|
||||
if (memcmp(out, res, 8) != 0)
|
||||
return 0; /* Output does not match -> strong cipher is not supported */
|
||||
if (memcmp(out, res, 8) != 0)
|
||||
return 0; /* Output does not match -> strong cipher is
|
||||
* not supported */
|
||||
return 1;
|
||||
}
|
||||
|
||||
@ -421,18 +425,19 @@ static int
|
||||
bf_init(PX_Cipher * c, const uint8 *key, unsigned klen, const uint8 *iv)
|
||||
{
|
||||
ossldata *od = c->ptr;
|
||||
static int bf_is_strong = -1;
|
||||
static int bf_is_strong = -1;
|
||||
|
||||
/*
|
||||
* Test if key len is supported. BF_set_key silently cut large keys and it could be
|
||||
* be a problem when user transfer crypted data from one server to another.
|
||||
* Test if key len is supported. BF_set_key silently cut large keys and it
|
||||
* could be be a problem when user transfer crypted data from one server
|
||||
* to another.
|
||||
*/
|
||||
|
||||
if( bf_is_strong == -1)
|
||||
|
||||
if (bf_is_strong == -1)
|
||||
bf_is_strong = bf_check_supported_key_len();
|
||||
|
||||
if( !bf_is_strong && klen>16 )
|
||||
return PXE_KEY_TOO_BIG;
|
||||
if (!bf_is_strong && klen > 16)
|
||||
return PXE_KEY_TOO_BIG;
|
||||
|
||||
/* Key len is supported. We can use it. */
|
||||
BF_set_key(&od->u.bf.key, klen, key);
|
||||
@ -750,13 +755,14 @@ ossl_aes_init(PX_Cipher * c, const uint8 *key, unsigned klen, const uint8 *iv)
|
||||
static int
|
||||
ossl_aes_key_init(ossldata * od, int type)
|
||||
{
|
||||
int err;
|
||||
int err;
|
||||
|
||||
/*
|
||||
* Strong key support could be missing on some openssl installations.
|
||||
* We must check return value from set key function.
|
||||
*/
|
||||
* Strong key support could be missing on some openssl installations. We
|
||||
* must check return value from set key function.
|
||||
*/
|
||||
if (type == AES_ENCRYPT)
|
||||
err = AES_set_encrypt_key(od->key, od->klen * 8, &od->u.aes_key);
|
||||
err = AES_set_encrypt_key(od->key, od->klen * 8, &od->u.aes_key);
|
||||
else
|
||||
err = AES_set_decrypt_key(od->key, od->klen * 8, &od->u.aes_key);
|
||||
|
||||
@ -776,7 +782,7 @@ ossl_aes_ecb_encrypt(PX_Cipher * c, const uint8 *data, unsigned dlen,
|
||||
unsigned bs = gen_ossl_block_size(c);
|
||||
ossldata *od = c->ptr;
|
||||
const uint8 *end = data + dlen - bs;
|
||||
int err;
|
||||
int err;
|
||||
|
||||
if (!od->init)
|
||||
if ((err = ossl_aes_key_init(od, AES_ENCRYPT)) != 0)
|
||||
@ -794,7 +800,7 @@ ossl_aes_ecb_decrypt(PX_Cipher * c, const uint8 *data, unsigned dlen,
|
||||
unsigned bs = gen_ossl_block_size(c);
|
||||
ossldata *od = c->ptr;
|
||||
const uint8 *end = data + dlen - bs;
|
||||
int err;
|
||||
int err;
|
||||
|
||||
if (!od->init)
|
||||
if ((err = ossl_aes_key_init(od, AES_DECRYPT)) != 0)
|
||||
@ -810,12 +816,12 @@ ossl_aes_cbc_encrypt(PX_Cipher * c, const uint8 *data, unsigned dlen,
|
||||
uint8 *res)
|
||||
{
|
||||
ossldata *od = c->ptr;
|
||||
int err;
|
||||
int err;
|
||||
|
||||
if (!od->init)
|
||||
if ((err = ossl_aes_key_init(od, AES_ENCRYPT)) != 0)
|
||||
return err;
|
||||
|
||||
|
||||
AES_cbc_encrypt(data, res, dlen, &od->u.aes_key, od->iv, AES_ENCRYPT);
|
||||
return 0;
|
||||
}
|
||||
@ -825,7 +831,7 @@ ossl_aes_cbc_decrypt(PX_Cipher * c, const uint8 *data, unsigned dlen,
|
||||
uint8 *res)
|
||||
{
|
||||
ossldata *od = c->ptr;
|
||||
int err;
|
||||
int err;
|
||||
|
||||
if (!od->init)
|
||||
if ((err = ossl_aes_key_init(od, AES_DECRYPT)) != 0)
|
||||
|
Reference in New Issue
Block a user