mirror of
https://github.com/postgres/postgres.git
synced 2025-07-27 12:41:57 +03:00
pgindent run on all C files. Java run to follow. initdb/regression
tests pass.
This commit is contained in:
@ -7,7 +7,7 @@
|
||||
* entirely in crypt_blowfish.c.
|
||||
*
|
||||
* Put bcrypt generator also here as crypt-blowfish.c
|
||||
* may not be compiled always. -- marko
|
||||
* may not be compiled always. -- marko
|
||||
*/
|
||||
|
||||
#include "postgres.h"
|
||||
@ -22,48 +22,55 @@
|
||||
typedef unsigned int BF_word;
|
||||
|
||||
unsigned char _crypt_itoa64[64 + 1] =
|
||||
"./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
|
||||
"./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
|
||||
|
||||
char *_crypt_gensalt_traditional_rn(unsigned long count,
|
||||
const char *input, int size, char *output, int output_size)
|
||||
char *
|
||||
_crypt_gensalt_traditional_rn(unsigned long count,
|
||||
const char *input, int size, char *output, int output_size)
|
||||
{
|
||||
if (size < 2 || output_size < 2 + 1 || (count && count != 25)) {
|
||||
if (output_size > 0) output[0] = '\0';
|
||||
if (size < 2 || output_size < 2 + 1 || (count && count != 25))
|
||||
{
|
||||
if (output_size > 0)
|
||||
output[0] = '\0';
|
||||
__set_errno((output_size < 2 + 1) ? ERANGE : EINVAL);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
output[0] = _crypt_itoa64[(unsigned int)input[0] & 0x3f];
|
||||
output[1] = _crypt_itoa64[(unsigned int)input[1] & 0x3f];
|
||||
output[0] = _crypt_itoa64[(unsigned int) input[0] & 0x3f];
|
||||
output[1] = _crypt_itoa64[(unsigned int) input[1] & 0x3f];
|
||||
output[2] = '\0';
|
||||
|
||||
return output;
|
||||
}
|
||||
|
||||
char *_crypt_gensalt_extended_rn(unsigned long count,
|
||||
const char *input, int size, char *output, int output_size)
|
||||
char *
|
||||
_crypt_gensalt_extended_rn(unsigned long count,
|
||||
const char *input, int size, char *output, int output_size)
|
||||
{
|
||||
unsigned long value;
|
||||
|
||||
/* Even iteration counts make it easier to detect weak DES keys from a look
|
||||
* at the hash, so they should be avoided */
|
||||
if (size < 3 || output_size < 1 + 4 + 4 + 1 ||
|
||||
(count && (count > 0xffffff || !(count & 1)))) {
|
||||
if (output_size > 0) output[0] = '\0';
|
||||
(count && (count > 0xffffff || !(count & 1))))
|
||||
{
|
||||
if (output_size > 0)
|
||||
output[0] = '\0';
|
||||
__set_errno((output_size < 1 + 4 + 4 + 1) ? ERANGE : EINVAL);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
if (!count) count = 725;
|
||||
if (!count)
|
||||
count = 725;
|
||||
|
||||
output[0] = '_';
|
||||
output[1] = _crypt_itoa64[count & 0x3f];
|
||||
output[2] = _crypt_itoa64[(count >> 6) & 0x3f];
|
||||
output[3] = _crypt_itoa64[(count >> 12) & 0x3f];
|
||||
output[4] = _crypt_itoa64[(count >> 18) & 0x3f];
|
||||
value = (unsigned long)input[0] |
|
||||
((unsigned long)input[1] << 8) |
|
||||
((unsigned long)input[2] << 16);
|
||||
value = (unsigned long) input[0] |
|
||||
((unsigned long) input[1] << 8) |
|
||||
((unsigned long) input[2] << 16);
|
||||
output[5] = _crypt_itoa64[value & 0x3f];
|
||||
output[6] = _crypt_itoa64[(value >> 6) & 0x3f];
|
||||
output[7] = _crypt_itoa64[(value >> 12) & 0x3f];
|
||||
@ -73,13 +80,16 @@ char *_crypt_gensalt_extended_rn(unsigned long count,
|
||||
return output;
|
||||
}
|
||||
|
||||
char *_crypt_gensalt_md5_rn(unsigned long count,
|
||||
const char *input, int size, char *output, int output_size)
|
||||
char *
|
||||
_crypt_gensalt_md5_rn(unsigned long count,
|
||||
const char *input, int size, char *output, int output_size)
|
||||
{
|
||||
unsigned long value;
|
||||
|
||||
if (size < 3 || output_size < 3 + 4 + 1 || (count && count != 1000)) {
|
||||
if (output_size > 0) output[0] = '\0';
|
||||
if (size < 3 || output_size < 3 + 4 + 1 || (count && count != 1000))
|
||||
{
|
||||
if (output_size > 0)
|
||||
output[0] = '\0';
|
||||
__set_errno((output_size < 3 + 4 + 1) ? ERANGE : EINVAL);
|
||||
return NULL;
|
||||
}
|
||||
@ -87,19 +97,20 @@ char *_crypt_gensalt_md5_rn(unsigned long count,
|
||||
output[0] = '$';
|
||||
output[1] = '1';
|
||||
output[2] = '$';
|
||||
value = (unsigned long)input[0] |
|
||||
((unsigned long)input[1] << 8) |
|
||||
((unsigned long)input[2] << 16);
|
||||
value = (unsigned long) input[0] |
|
||||
((unsigned long) input[1] << 8) |
|
||||
((unsigned long) input[2] << 16);
|
||||
output[3] = _crypt_itoa64[value & 0x3f];
|
||||
output[4] = _crypt_itoa64[(value >> 6) & 0x3f];
|
||||
output[5] = _crypt_itoa64[(value >> 12) & 0x3f];
|
||||
output[6] = _crypt_itoa64[(value >> 18) & 0x3f];
|
||||
output[7] = '\0';
|
||||
|
||||
if (size >= 6 && output_size >= 3 + 4 + 4 + 1) {
|
||||
value = (unsigned long)input[3] |
|
||||
((unsigned long)input[4] << 8) |
|
||||
((unsigned long)input[5] << 16);
|
||||
if (size >= 6 && output_size >= 3 + 4 + 4 + 1)
|
||||
{
|
||||
value = (unsigned long) input[3] |
|
||||
((unsigned long) input[4] << 8) |
|
||||
((unsigned long) input[5] << 16);
|
||||
output[7] = _crypt_itoa64[value & 0x3f];
|
||||
output[8] = _crypt_itoa64[(value >> 6) & 0x3f];
|
||||
output[9] = _crypt_itoa64[(value >> 12) & 0x3f];
|
||||
@ -113,20 +124,24 @@ char *_crypt_gensalt_md5_rn(unsigned long count,
|
||||
|
||||
|
||||
static unsigned char BF_itoa64[64 + 1] =
|
||||
"./ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
|
||||
"./ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
|
||||
|
||||
static void BF_encode(char *dst, const BF_word *src, int size)
|
||||
static void
|
||||
BF_encode(char *dst, const BF_word * src, int size)
|
||||
{
|
||||
unsigned char *sptr = (unsigned char *)src;
|
||||
unsigned char *sptr = (unsigned char *) src;
|
||||
unsigned char *end = sptr + size;
|
||||
unsigned char *dptr = (unsigned char *)dst;
|
||||
unsigned int c1, c2;
|
||||
unsigned char *dptr = (unsigned char *) dst;
|
||||
unsigned int c1,
|
||||
c2;
|
||||
|
||||
do {
|
||||
do
|
||||
{
|
||||
c1 = *sptr++;
|
||||
*dptr++ = BF_itoa64[c1 >> 2];
|
||||
c1 = (c1 & 0x03) << 4;
|
||||
if (sptr >= end) {
|
||||
if (sptr >= end)
|
||||
{
|
||||
*dptr++ = BF_itoa64[c1];
|
||||
break;
|
||||
}
|
||||
@ -135,7 +150,8 @@ static void BF_encode(char *dst, const BF_word *src, int size)
|
||||
c1 |= c2 >> 4;
|
||||
*dptr++ = BF_itoa64[c1];
|
||||
c1 = (c2 & 0x0f) << 2;
|
||||
if (sptr >= end) {
|
||||
if (sptr >= end)
|
||||
{
|
||||
*dptr++ = BF_itoa64[c1];
|
||||
break;
|
||||
}
|
||||
@ -147,17 +163,21 @@ static void BF_encode(char *dst, const BF_word *src, int size)
|
||||
} while (sptr < end);
|
||||
}
|
||||
|
||||
char *_crypt_gensalt_blowfish_rn(unsigned long count,
|
||||
const char *input, int size, char *output, int output_size)
|
||||
char *
|
||||
_crypt_gensalt_blowfish_rn(unsigned long count,
|
||||
const char *input, int size, char *output, int output_size)
|
||||
{
|
||||
if (size < 16 || output_size < 7 + 22 + 1 ||
|
||||
(count && (count < 4 || count > 31))) {
|
||||
if (output_size > 0) output[0] = '\0';
|
||||
(count && (count < 4 || count > 31)))
|
||||
{
|
||||
if (output_size > 0)
|
||||
output[0] = '\0';
|
||||
__set_errno((output_size < 7 + 22 + 1) ? ERANGE : EINVAL);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
if (!count) count = 5;
|
||||
if (!count)
|
||||
count = 5;
|
||||
|
||||
output[0] = '$';
|
||||
output[1] = '2';
|
||||
@ -167,9 +187,8 @@ char *_crypt_gensalt_blowfish_rn(unsigned long count,
|
||||
output[5] = '0' + count % 10;
|
||||
output[6] = '$';
|
||||
|
||||
BF_encode(&output[7], (BF_word *)input, 16);
|
||||
BF_encode(&output[7], (BF_word *) input, 16);
|
||||
output[7 + 22] = '\0';
|
||||
|
||||
return output;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user