mirror of
https://github.com/postgres/postgres.git
synced 2025-04-22 23:02:54 +03:00
Changes needed to build at all: - Check for SSL_new in configure, now that SSL_library_init is a macro. - Do not access struct members directly. This includes some new code in pgcrypto, to use the resource owner mechanism to ensure that we don't leak OpenSSL handles, now that we can't embed them in other structs anymore. - RAND_SSLeay() -> RAND_OpenSSL() Changes that were needed to silence deprecation warnings, but were not strictly necessary: - RAND_pseudo_bytes() -> RAND_bytes(). - SSL_library_init() and OpenSSL_config() -> OPENSSL_init_ssl() - ASN1_STRING_data() -> ASN1_STRING_get0_data() - DH_generate_parameters() -> DH_generate_parameters() - Locking callbacks are not needed with OpenSSL 1.1.0 anymore. (Good riddance!) Also change references to SSLEAY_VERSION_NUMBER with OPENSSL_VERSION_NUMBER, for the sake of consistency. OPENSSL_VERSION_NUMBER has existed since time immemorial. Fix SSL test suite to work with OpenSSL 1.1.0. CA certificates must have the "CA:true" basic constraint extension now, or OpenSSL will refuse them. Regenerate the test certificates with that. The "openssl" binary, used to generate the certificates, is also now more picky, and throws an error if an X509 extension is specified in "req_extensions", but that section is empty. Backpatch to 9.5 and 9.6, per popular demand. The file structure was somewhat different in earlier branches, so I didn't bother to go further than that. In back-branches, we still support OpenSSL 0.9.7 and above. OpenSSL 0.9.6 should still work too, but I didn't test it. In master, we only support 0.9.8 and above. Patch by Andreas Karlsson, with additional changes by me. Discussion: <20160627151604.GD1051@msg.df7cb.de>
299 lines
5.8 KiB
C
299 lines
5.8 KiB
C
/*
|
|
* pgp-s2k.c
|
|
* OpenPGP string2key functions.
|
|
*
|
|
* Copyright (c) 2005 Marko Kreen
|
|
* All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
* documentation and/or other materials provided with the distribution.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
|
|
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
|
|
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
|
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
|
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
|
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
|
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
|
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
|
* SUCH DAMAGE.
|
|
*
|
|
* contrib/pgcrypto/pgp-s2k.c
|
|
*/
|
|
|
|
#include "postgres.h"
|
|
|
|
#include "px.h"
|
|
#include "pgp.h"
|
|
|
|
static int
|
|
calc_s2k_simple(PGP_S2K *s2k, PX_MD *md, const uint8 *key,
|
|
unsigned key_len)
|
|
{
|
|
unsigned md_rlen;
|
|
uint8 buf[PGP_MAX_DIGEST];
|
|
unsigned preload;
|
|
unsigned remain;
|
|
uint8 *dst = s2k->key;
|
|
|
|
md_rlen = px_md_result_size(md);
|
|
|
|
remain = s2k->key_len;
|
|
preload = 0;
|
|
while (remain > 0)
|
|
{
|
|
px_md_reset(md);
|
|
|
|
if (preload)
|
|
{
|
|
memset(buf, 0, preload);
|
|
px_md_update(md, buf, preload);
|
|
}
|
|
preload++;
|
|
|
|
px_md_update(md, key, key_len);
|
|
px_md_finish(md, buf);
|
|
|
|
if (remain > md_rlen)
|
|
{
|
|
memcpy(dst, buf, md_rlen);
|
|
dst += md_rlen;
|
|
remain -= md_rlen;
|
|
}
|
|
else
|
|
{
|
|
memcpy(dst, buf, remain);
|
|
remain = 0;
|
|
}
|
|
}
|
|
px_memset(buf, 0, sizeof(buf));
|
|
return 0;
|
|
}
|
|
|
|
static int
|
|
calc_s2k_salted(PGP_S2K *s2k, PX_MD *md, const uint8 *key, unsigned key_len)
|
|
{
|
|
unsigned md_rlen;
|
|
uint8 buf[PGP_MAX_DIGEST];
|
|
unsigned preload = 0;
|
|
uint8 *dst;
|
|
unsigned remain;
|
|
|
|
md_rlen = px_md_result_size(md);
|
|
|
|
dst = s2k->key;
|
|
remain = s2k->key_len;
|
|
while (remain > 0)
|
|
{
|
|
px_md_reset(md);
|
|
|
|
if (preload > 0)
|
|
{
|
|
memset(buf, 0, preload);
|
|
px_md_update(md, buf, preload);
|
|
}
|
|
preload++;
|
|
|
|
px_md_update(md, s2k->salt, PGP_S2K_SALT);
|
|
px_md_update(md, key, key_len);
|
|
px_md_finish(md, buf);
|
|
|
|
if (remain > md_rlen)
|
|
{
|
|
memcpy(dst, buf, md_rlen);
|
|
remain -= md_rlen;
|
|
dst += md_rlen;
|
|
}
|
|
else
|
|
{
|
|
memcpy(dst, buf, remain);
|
|
remain = 0;
|
|
}
|
|
}
|
|
px_memset(buf, 0, sizeof(buf));
|
|
return 0;
|
|
}
|
|
|
|
static int
|
|
calc_s2k_iter_salted(PGP_S2K *s2k, PX_MD *md, const uint8 *key,
|
|
unsigned key_len)
|
|
{
|
|
unsigned md_rlen;
|
|
uint8 buf[PGP_MAX_DIGEST];
|
|
uint8 *dst;
|
|
unsigned preload = 0;
|
|
unsigned remain,
|
|
c,
|
|
cval,
|
|
curcnt,
|
|
count;
|
|
|
|
cval = s2k->iter;
|
|
count = ((unsigned) 16 + (cval & 15)) << ((cval >> 4) + 6);
|
|
|
|
md_rlen = px_md_result_size(md);
|
|
|
|
remain = s2k->key_len;
|
|
dst = s2k->key;
|
|
while (remain > 0)
|
|
{
|
|
px_md_reset(md);
|
|
|
|
if (preload)
|
|
{
|
|
memset(buf, 0, preload);
|
|
px_md_update(md, buf, preload);
|
|
}
|
|
preload++;
|
|
|
|
px_md_update(md, s2k->salt, PGP_S2K_SALT);
|
|
px_md_update(md, key, key_len);
|
|
curcnt = PGP_S2K_SALT + key_len;
|
|
|
|
while (curcnt < count)
|
|
{
|
|
if (curcnt + PGP_S2K_SALT < count)
|
|
c = PGP_S2K_SALT;
|
|
else
|
|
c = count - curcnt;
|
|
px_md_update(md, s2k->salt, c);
|
|
curcnt += c;
|
|
|
|
if (curcnt + key_len < count)
|
|
c = key_len;
|
|
else if (curcnt < count)
|
|
c = count - curcnt;
|
|
else
|
|
break;
|
|
px_md_update(md, key, c);
|
|
curcnt += c;
|
|
}
|
|
px_md_finish(md, buf);
|
|
|
|
if (remain > md_rlen)
|
|
{
|
|
memcpy(dst, buf, md_rlen);
|
|
remain -= md_rlen;
|
|
dst += md_rlen;
|
|
}
|
|
else
|
|
{
|
|
memcpy(dst, buf, remain);
|
|
remain = 0;
|
|
}
|
|
}
|
|
px_memset(buf, 0, sizeof(buf));
|
|
return 0;
|
|
}
|
|
|
|
/*
|
|
* Decide S2K_ISALTED iteration count
|
|
*
|
|
* Too small: weak
|
|
* Too big: slow
|
|
* gpg defaults to 96 => 65536 iters
|
|
* let it float a bit: 96 + 32 => 262144 iters
|
|
*/
|
|
static int
|
|
decide_count(unsigned rand_byte)
|
|
{
|
|
return 96 + (rand_byte & 0x1F);
|
|
}
|
|
|
|
int
|
|
pgp_s2k_fill(PGP_S2K *s2k, int mode, int digest_algo)
|
|
{
|
|
int res = 0;
|
|
uint8 tmp;
|
|
|
|
s2k->mode = mode;
|
|
s2k->digest_algo = digest_algo;
|
|
|
|
switch (s2k->mode)
|
|
{
|
|
case 0:
|
|
break;
|
|
case 1:
|
|
res = px_get_random_bytes(s2k->salt, PGP_S2K_SALT);
|
|
break;
|
|
case 3:
|
|
res = px_get_random_bytes(s2k->salt, PGP_S2K_SALT);
|
|
if (res < 0)
|
|
break;
|
|
res = px_get_random_bytes(&tmp, 1);
|
|
if (res < 0)
|
|
break;
|
|
s2k->iter = decide_count(tmp);
|
|
break;
|
|
default:
|
|
res = PXE_PGP_BAD_S2K_MODE;
|
|
}
|
|
return res;
|
|
}
|
|
|
|
int
|
|
pgp_s2k_read(PullFilter *src, PGP_S2K *s2k)
|
|
{
|
|
int res = 0;
|
|
|
|
GETBYTE(src, s2k->mode);
|
|
GETBYTE(src, s2k->digest_algo);
|
|
switch (s2k->mode)
|
|
{
|
|
case 0:
|
|
break;
|
|
case 1:
|
|
res = pullf_read_fixed(src, 8, s2k->salt);
|
|
break;
|
|
case 3:
|
|
res = pullf_read_fixed(src, 8, s2k->salt);
|
|
if (res < 0)
|
|
break;
|
|
GETBYTE(src, s2k->iter);
|
|
break;
|
|
default:
|
|
res = PXE_PGP_BAD_S2K_MODE;
|
|
}
|
|
return res;
|
|
}
|
|
|
|
int
|
|
pgp_s2k_process(PGP_S2K *s2k, int cipher, const uint8 *key, int key_len)
|
|
{
|
|
int res;
|
|
PX_MD *md;
|
|
|
|
s2k->key_len = pgp_get_cipher_key_size(cipher);
|
|
if (s2k->key_len <= 0)
|
|
return PXE_PGP_UNSUPPORTED_CIPHER;
|
|
|
|
res = pgp_load_digest(s2k->digest_algo, &md);
|
|
if (res < 0)
|
|
return res;
|
|
|
|
switch (s2k->mode)
|
|
{
|
|
case 0:
|
|
res = calc_s2k_simple(s2k, md, key, key_len);
|
|
break;
|
|
case 1:
|
|
res = calc_s2k_salted(s2k, md, key, key_len);
|
|
break;
|
|
case 3:
|
|
res = calc_s2k_iter_salted(s2k, md, key, key_len);
|
|
break;
|
|
default:
|
|
res = PXE_PGP_BAD_S2K_MODE;
|
|
}
|
|
px_md_free(md);
|
|
return res;
|
|
}
|