Skip to content

Commit 1abf76e

Browse files
author
Neil Conway
committed
"Annual" pgcrypto update from Marko Kreen:
Few cleanups and couple of new things: - add SHA2 algorithm to older OpenSSL - add BIGNUM math to have public-key cryptography work on non-OpenSSL build. - gen_random_bytes() function The status of SHA2 algoritms and public-key encryption can now be changed to 'always available.' That makes pgcrypto functionally complete and unless there will be new editions of AES, SHA2 or OpenPGP standards, there is no major changes planned.
1 parent 99ac1e6 commit 1abf76e

22 files changed

+4397
-374
lines changed

‎contrib/pgcrypto/Makefile

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,26 @@
11
#
2-
# $PostgreSQL: pgsql/contrib/pgcrypto/Makefile,v 1.23 2005/09/27 17:13:08 tgl Exp $
2+
# $PostgreSQL: pgsql/contrib/pgcrypto/Makefile,v 1.24 2006/07/13 04:15:24 neilc Exp $
33
#
44

5-
INT_SRCS = md5.c sha1.c sha2.c internal.c blf.c rijndael.c \
6-
fortuna.c random.c pgp-mpi-internal.c
5+
INT_SRCS = md5.c sha1.c sha2.c internal.c internal-sha2.c blf.c rijndael.c \
6+
fortuna.c random.c pgp-mpi-internal.c imath.c
77
INT_TESTS = sha2
88

99
OSSL_SRCS = openssl.c pgp-mpi-openssl.c
10-
OSSL_TESTS = des 3des cast5
10+
OSSL_TESTS = sha2 des 3des cast5
1111

1212
ZLIB_OFF_CFLAGS = -DDISABLE_ZLIB
1313
ZLIB_TST = pgp-compression
1414
ZLIB_OFF_TST = pgp-zlib-DISABLED
15-
PUBENC_ON = pgp-pubkey-decrypt pgp-pubkey-encrypt pgp-info
16-
PUBENC_OFF = pgp-pubkey-DISABLED
1715

1816
CF_SRCS = $(if $(subst no,,$(with_openssl)), $(OSSL_SRCS), $(INT_SRCS))
1917
CF_TESTS = $(if $(subst no,,$(with_openssl)), $(OSSL_TESTS), $(INT_TESTS))
2018
CF_CFLAGS = $(if $(subst yes,,$(with_zlib)), $(ZLIB_OFF_CFLAGS))
21-
CF_PGP_TESTS = $(if $(subst no,,$(with_zlib)), $(ZLIB_TST), $(ZLIB_OFF_TST)) \
22-
$(if $(subst no,,$(with_openssl)), $(PUBENC_ON), $(PUBENC_OFF))
19+
CF_PGP_TESTS = $(if $(subst no,,$(with_zlib)), $(ZLIB_TST), $(ZLIB_OFF_TST))
2320

2421
PG_CPPFLAGS = $(CF_CFLAGS)
2522

26-
SRCS = pgcrypto.c px.c px-hmac.c px-crypt.c misc.c \
23+
SRCS = pgcrypto.c px.c px-hmac.c px-crypt.c \
2724
crypt-gensalt.c crypt-blowfish.c crypt-des.c \
2825
crypt-md5.c $(CF_SRCS) \
2926
mbuf.c pgp.c pgp-armor.c pgp-cfb.c pgp-compress.c \
@@ -35,12 +32,14 @@ MODULE_big = pgcrypto
3532
OBJS = $(SRCS:.c=.o)
3633
DOCS = README.pgcrypto
3734
DATA_built = pgcrypto.sql
35+
DATA = uninstall_pgcrypto.sql
3836
EXTRA_CLEAN = gen-rtab
3937

4038
REGRESS = init md5 sha1 hmac-md5 hmac-sha1 blowfish rijndael \
4139
$(CF_TESTS) \
4240
crypt-des crypt-md5 crypt-blowfish crypt-xdes \
43-
pgp-armor pgp-decrypt pgp-encrypt $(CF_PGP_TESTS)
41+
pgp-armor pgp-decrypt pgp-encrypt $(CF_PGP_TESTS) \
42+
pgp-pubkey-decrypt pgp-pubkey-encrypt pgp-info
4443

4544

4645
ifdef USE_PGXS

‎contrib/pgcrypto/README.pgcrypto

Lines changed: 28 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -49,14 +49,14 @@ There are some other differences with and without OpenSSL:
4949
----------------------------------------------------
5050
MD5 yes yes
5151
SHA1 yes yes
52-
SHA256/384/512 yes since 0.9.8
52+
SHA224/256/384/512 yes yes (3)
5353
Any other digest algo no yes (1)
5454
Blowfish yes yes
5555
AES yes yes (2)
5656
DES/3DES/CAST5 no yes
5757
Raw encryption yes yes
5858
PGP Symmetric encryption yes yes
59-
PGP Public-Key encryption no yes
59+
PGP Public-Key encryption yes yes
6060
----------------------------------------------------
6161

6262
1. Any digest algorithm OpenSSL supports is automatically picked up.
@@ -67,6 +67,9 @@ There are some other differences with and without OpenSSL:
6767
compiled against older version, it will use built-in AES code,
6868
so it has AES always available.
6969

70+
3. SHA2 algorithms were added to OpenSSL in version 0.9.8. For
71+
older versions, pgcrypto will use built-in code.
72+
7073

7174
2.2. NULL handling
7275
~~~~~~~~~~~~~~~~~~~~
@@ -621,36 +624,47 @@ is equal to
621624
encrypt(data, 'fooz', 'bf-cbc/pad:pkcs')
622625

623626

624-
7. Credits
627+
7. Random bytes
628+
-----------------
629+
630+
gen_random_bytes(count integer)
631+
632+
Returns `count` cryptographically strong random bytes as bytea value.
633+
There can be maximally 1024 bytes extracted at a time. This is to avoid
634+
draining the randomness generator pool.
635+
636+
637+
8. Credits
625638
------------
626639

627640
I have used code from following sources:
628641

629-
`--------------------`-------------------------`----------------------
642+
`--------------------`-------------------------`-------------------------------
630643
Algorithm Author Source origin
631-
----------------------------------------------------------------------
644+
-------------------------------------------------------------------------------
632645
DES crypt() David Burren and others FreeBSD libcrypt
633646
MD5 crypt() Poul-Henning Kamp FreeBSD libcrypt
634647
Blowfish crypt() Solar Designer www.openwall.com
635648
Blowfish cipher Niels Provos OpenBSD sys/crypto
636649
Rijndael cipher Brian Gladman OpenBSD sys/crypto
637650
MD5 and SHA1 WIDE Project KAME kame/sys/crypto
638651
SHA256/384/512 Aaron D. Gifford OpenBSD sys/crypto
639-
----------------------------------------------------------------------
652+
BIGNUM math Michael J. Fromberger dartmouth.edu/~sting/sw/imath
653+
-------------------------------------------------------------------------------
640654

641655

642-
8. Legalese
656+
9. Legalese
643657
-------------
644658

645659
* I owe a beer to Poul-Henning.
646660
* This product includes software developed by Niels Provos.
647661

648662

649-
9. References/Links
650-
---------------------
663+
10. References/Links
664+
----------------------
651665

652-
9.1. Useful reading
653-
~~~~~~~~~~~~~~~~~~~~~
666+
10.1. Useful reading
667+
~~~~~~~~~~~~~~~~~~~~~~
654668

655669
http://www.gnupg.org/gph/en/manual.html[]::
656670
The GNU Privacy Handbook
@@ -668,8 +682,8 @@ http://www.interhack.net/people/cmcurtin/snake-oil-faq.html[]::
668682
Describes good and bad cryptography.
669683

670684

671-
9.2. Technical references
672-
~~~~~~~~~~~~~~~~~~~~~~~~~~~
685+
10.2. Technical references
686+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~
673687

674688
http://www.ietf.org/rfc/rfc2440.txt[]::
675689
OpenPGP message format
@@ -699,4 +713,4 @@ http://www.cs.ut.ee/~helger/crypto/[]::
699713
Collection of cryptology pointers.
700714

701715

702-
// $PostgreSQL: pgsql/contrib/pgcrypto/README.pgcrypto,v 1.14 2005/11/03 02:54:07 tgl Exp $
716+
// $PostgreSQL: pgsql/contrib/pgcrypto/README.pgcrypto,v 1.15 2006/07/13 04:15:24 neilc Exp $

‎contrib/pgcrypto/crypt-des.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* FreeSec: libcrypt for NetBSD
33
*
4-
* $PostgreSQL: pgsql/contrib/pgcrypto/crypt-des.c,v 1.14 2006/03/11 04:38:30 momjian Exp $
4+
* $PostgreSQL: pgsql/contrib/pgcrypto/crypt-des.c,v 1.15 2006/07/13 04:15:24 neilc Exp $
55
*
66
* Copyright (c) 1994 David Burren
77
* All rights reserved.
@@ -71,6 +71,9 @@
7171

7272
#define _PASSWORD_EFMT1 '_'
7373

74+
static const char _crypt_a64[] =
75+
"./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
76+
7477
static uint8 IP[64] = {
7578
58, 50, 42, 34, 26, 18, 10, 2, 60, 52, 44, 36, 28, 20, 12, 4,
7679
62, 54, 46, 38, 30, 22, 14, 6, 64, 56, 48, 40, 32, 24, 16, 8,

‎contrib/pgcrypto/crypt-gensalt.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* Written by Solar Designer and placed in the public domain.
33
* See crypt_blowfish.c for more information.
44
*
5-
* $PostgreSQL: pgsql/contrib/pgcrypto/crypt-gensalt.c,v 1.8 2006/03/11 04:38:30 momjian Exp $
5+
* $PostgreSQL: pgsql/contrib/pgcrypto/crypt-gensalt.c,v 1.9 2006/07/13 04:15:24 neilc Exp $
66
*
77
* This file contains salt generation functions for the traditional and
88
* other common crypt(3) algorithms, except for bcrypt which is defined
@@ -19,7 +19,7 @@
1919

2020
typedef unsigned int BF_word;
2121

22-
unsigned char _crypt_itoa64[64 + 1] =
22+
static unsigned char _crypt_itoa64[64 + 1] =
2323
"./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
2424

2525
char *

‎contrib/pgcrypto/crypt-md5.c

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
* $FreeBSD: src/lib/libcrypt/crypt-md5.c,v 1.5 1999/12/17 20:21:45 peter Exp $
1010
*
11-
* $PostgreSQL: pgsql/contrib/pgcrypto/crypt-md5.c,v 1.6 2005/10/15 02:49:06 momjian Exp $
11+
* $PostgreSQL: pgsql/contrib/pgcrypto/crypt-md5.c,v 1.7 2006/07/13 04:15:24 neilc Exp $
1212
*/
1313

1414
#include "postgres.h"
@@ -17,6 +17,20 @@
1717
#include "px-crypt.h"
1818

1919
#define MD5_SIZE 16
20+
21+
static const char _crypt_a64[] =
22+
"./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
23+
24+
static void
25+
_crypt_to64(char *s, unsigned long v, int n)
26+
{
27+
while (--n >= 0)
28+
{
29+
*s++ = _crypt_a64[v & 0x3f];
30+
v >>= 6;
31+
}
32+
}
33+
2034
/*
2135
* UNIX password
2236
*/

‎contrib/pgcrypto/expected/sha2.out

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,37 @@
11
--
22
-- SHA2 family
33
--
4+
-- SHA224
5+
SELECT encode(digest('', 'sha224'), 'hex');
6+
encode
7+
----------------------------------------------------------
8+
d14a028c2a3a2bc9476102bb288234c415a2b01f828ea62ac5b3e42f
9+
(1 row)
10+
11+
SELECT encode(digest('a', 'sha224'), 'hex');
12+
encode
13+
----------------------------------------------------------
14+
abd37534c7d9a2efb9465de931cd7055ffdb8879563ae98078d6d6d5
15+
(1 row)
16+
17+
SELECT encode(digest('abc', 'sha224'), 'hex');
18+
encode
19+
----------------------------------------------------------
20+
23097d223405d8228642a477bda255b32aadbce4bda0b3f7e36c9da7
21+
(1 row)
22+
23+
SELECT encode(digest('abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq', 'sha224'), 'hex');
24+
encode
25+
----------------------------------------------------------
26+
75388b16512776cc5dba5da1fd890150b0c6455cb4f58b1952522525
27+
(1 row)
28+
29+
SELECT encode(digest('12345678901234567890123456789012345678901234567890123456789012345678901234567890', 'sha224'), 'hex');
30+
encode
31+
----------------------------------------------------------
32+
b50aecbe4e9bb0b57bc5f3ae760a8e01db24f203fb3cdcd13148046e
33+
(1 row)
34+
435
-- SHA256
536
SELECT encode(digest('', 'sha256'), 'hex');
637
encode

‎contrib/pgcrypto/fortuna.c

Lines changed: 29 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
2727
* SUCH DAMAGE.
2828
*
29-
* $PostgreSQL: pgsql/contrib/pgcrypto/fortuna.c,v 1.6 2006/05/21 20:22:16 tgl Exp $
29+
* $PostgreSQL: pgsql/contrib/pgcrypto/fortuna.c,v 1.7 2006/07/13 04:15:24 neilc Exp $
3030
*/
3131

3232
#include "postgres.h"
@@ -125,7 +125,7 @@ struct fortuna_state
125125
struct timeval last_reseed_time;
126126
unsigned pool0_bytes;
127127
unsigned rnd_pos;
128-
int counter_init;
128+
int tricks_done;
129129
};
130130
typedef struct fortuna_state FState;
131131

@@ -332,7 +332,7 @@ add_entropy(FState * st, const uint8 *data, unsigned len)
332332
/*
333333
* Make sure the pool 0 is initialized, then update randomly.
334334
*/
335-
if (st->reseed_count == 0 && st->pool0_bytes < POOL0_FILL)
335+
if (st->reseed_count == 0)
336336
pos = 0;
337337
else
338338
pos = get_rand_pool(st);
@@ -357,21 +357,34 @@ rekey(FState * st)
357357
}
358358

359359
/*
360-
* Fortuna relies on AES standing known-plaintext attack.
361-
* In case it does not, slow down the attacker by initialising
362-
* the couter to random value.
360+
* Hide public constants. (counter, pools > 0)
361+
*
362+
* This can also be viewed as spreading the startup
363+
* entropy over all of the components.
363364
*/
364365
static void
365-
init_counter(FState * st)
366+
startup_tricks(FState * st)
366367
{
368+
int i;
369+
uint8 buf[BLOCK];
370+
367371
/* Use next block as counter. */
368372
encrypt_counter(st, st->counter);
369373

374+
/* Now shuffle pools, excluding #0 */
375+
for (i = 1; i < NUM_POOLS; i++)
376+
{
377+
encrypt_counter(st, buf);
378+
encrypt_counter(st, buf + CIPH_BLOCK);
379+
md_update(&st->pool[i], buf, BLOCK);
380+
}
381+
memset(buf, 0, BLOCK);
382+
370383
/* Hide the key. */
371384
rekey(st);
372385

373-
/* The counter can be shuffled only once. */
374-
st->counter_init = 1;
386+
/* This can be done only once. */
387+
st->tricks_done = 1;
375388
}
376389

377390
static void
@@ -380,13 +393,14 @@ extract_data(FState * st, unsigned count, uint8 *dst)
380393
unsigned n;
381394
unsigned block_nr = 0;
382395

383-
/* Can we reseed? */
384-
if (st->pool0_bytes >= POOL0_FILL && enough_time_passed(st))
385-
reseed(st);
396+
/* Should we reseed? */
397+
if (st->pool0_bytes >= POOL0_FILL || st->reseed_count == 0)
398+
if (enough_time_passed(st))
399+
reseed(st);
386400

387-
/* Is counter initialized? */
388-
if (!st->counter_init)
389-
init_counter(st);
401+
/* Do some randomization on first call */
402+
if (!st->tricks_done)
403+
startup_tricks(st);
390404

391405
while (count > 0)
392406
{

0 commit comments

Comments
 (0)