database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-04-21 12:05:57 +03:00
Code

Replace 4-clause licensed blf.[ch] with blowfish implementation

Browse Source 
from PuTTY with is under minimal BSD/MIT license. Marko Kreen.
This commit is contained in:
Neil Conway 2007-03-28 22:48:58 +00:00
parent 7d4c9a5793
commit 74b667ad42
4 changed files with 492 additions and 721 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
contrib/pgcrypto/README.pgcrypto
View File

@ -639,7 +639,7 @@ I have used code from following sources:
DES crypt() David Burren and others FreeBSD libcrypt DES crypt() David Burren and others FreeBSD libcrypt
MD5 crypt() Poul-Henning Kamp FreeBSD libcrypt MD5 crypt() Poul-Henning Kamp FreeBSD libcrypt
Blowfish crypt() Solar Designer www.openwall.com Blowfish crypt() Solar Designer www.openwall.com
Blowfish cipher Niels Provos OpenBSD sys/crypto Blowfish cipher Simon Tatham PuTTY
Rijndael cipher Brian Gladman OpenBSD sys/crypto Rijndael cipher Brian Gladman OpenBSD sys/crypto
MD5 and SHA1 WIDE Project KAME kame/sys/crypto MD5 and SHA1 WIDE Project KAME kame/sys/crypto
SHA256/384/512 Aaron D. Gifford OpenBSD sys/crypto SHA256/384/512 Aaron D. Gifford OpenBSD sys/crypto
@ -651,7 +651,6 @@ I have used code from following sources:
------------- -------------
* I owe a beer to Poul-Henning. * I owe a beer to Poul-Henning.
* This product includes software developed by Niels Provos.
10. References/Links 10. References/Links
@ -707,4 +706,4 @@ http://www.cs.ut.ee/~helger/crypto/[]::
Collection of cryptology pointers. Collection of cryptology pointers.
// $PostgreSQL: pgsql/contrib/pgcrypto/README.pgcrypto,v 1.18 2006/09/05 21:26:48 tgl Exp $ // $PostgreSQL: pgsql/contrib/pgcrypto/README.pgcrypto,v 1.19 2007/03/28 22:48:58 neilc Exp $

1073
contrib/pgcrypto/blf.c
View File

File diff suppressed because it is too large Load Diff

111
contrib/pgcrypto/blf.h
View File

@ -1,83 +1,48 @@
/* $OpenBSD: blf.h,v 1.3 2001/05/15 02:40:35 deraadt Exp $ */ /* $PostgreSQL: pgsql/contrib/pgcrypto/blf.h,v 1.6 2007/03/28 22:48:58 neilc Exp $ */
/* /*
* Blowfish - a fast block cipher designed by Bruce Schneier * PuTTY is copyright 1997-2007 Simon Tatham.
* *
* Copyright 1997 Niels Provos <provos@physnet.uni-hamburg.de> * Portions copyright Robert de Bath, Joris van Rantwijk, Delian
* All rights reserved. * Delchev, Andreas Schultz, Jeroen Massar, Wez Furlong, Nicolas Barry,
* Justin Bradford, Ben Harris, Malcolm Smith, Ahmad Khalifa, Markus
* Kuhn, and CORE SDI S.A.
* *
* Redistribution and use in source and binary forms, with or without * Permission is hereby granted, free of charge, to any person
* modification, are permitted provided that the following conditions * obtaining a copy of this software and associated documentation files
* are met: * (the "Software"), to deal in the Software without restriction,
* 1. Redistributions of source code must retain the above copyright * including without limitation the rights to use, copy, modify, merge,
* notice, this list of conditions and the following disclaimer. * publish, distribute, sublicense, and/or sell copies of the Software,
* 2. Redistributions in binary form must reproduce the above copyright * and to permit persons to whom the Software is furnished to do so,
* notice, this list of conditions and the following disclaimer in the * subject to the following conditions:
* documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* This product includes software developed by Niels Provos.
* 4. The name of the author may not be used to endorse or promote products
* derived from this software without specific prior written permission.
* *
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * The above copyright notice and this permission notice shall be
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES * included in all copies or substantial portions of the Software.
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. *
* IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY * NONINFRINGEMENT. IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/ */
#ifndef _BLF_H_ typedef struct
#define _BLF_H_
/* Schneier states the maximum key length to be 56 bytes.
* The way how the subkeys are initalized by the key up
* to (N+2)*4 i.e. 72 bytes are utilized.
* Warning: For normal blowfish encryption only 56 bytes
* of the key affect all cipherbits.
*/
#define BLF_N 16 /* Number of Subkeys */
#define BLF_MAXKEYLEN ((BLF_N-2)*4) /* 448 bits */
/* Blowfish context */
typedef struct BlowfishContext
{ {
uint32 S[4][256]; /* S-Boxes */ uint32 S0[256],
uint32 P[BLF_N + 2]; /* Subkeys */ S1[256],
} blf_ctx; S2[256],
S3[256],
P[18];
uint32 iv0,
iv1; /* for CBC mode */
} BlowfishContext;
/* Raw access to customized Blowfish void blowfish_setkey(BlowfishContext *ctx, const uint8 *key, short keybytes);
* blf_key is just: void blowfish_setiv(BlowfishContext *ctx, const uint8 *iv);
* Blowfish_initstate( state ) void blowfish_encrypt_cbc(uint8 *blk, int len, BlowfishContext *ctx);
* Blowfish_expand0state( state, key, keylen ) void blowfish_decrypt_cbc(uint8 *blk, int len, BlowfishContext *ctx);
*/ void blowfish_encrypt_ecb(uint8 *blk, int len, BlowfishContext *ctx);
void blowfish_decrypt_ecb(uint8 *blk, int len, BlowfishContext *ctx);
void Blowfish_encipher(blf_ctx *, uint32 *);
void Blowfish_decipher(blf_ctx *, uint32 *);
void Blowfish_initstate(blf_ctx *);
void Blowfish_expand0state(blf_ctx *, const uint8 *, uint16);
void Blowfish_expandstate
(blf_ctx *, const uint8 *, uint16, const uint8 *, uint16);
/* Standard Blowfish */
void blf_key(blf_ctx *, const uint8 *, uint16);
void blf_enc(blf_ctx *, uint32 *, uint16);
void blf_dec(blf_ctx *, uint32 *, uint16);
/* Converts uint8 to uint32 */
uint32 Blowfish_stream2word(const uint8 *, uint16, uint16 *);
void blf_ecb_encrypt(blf_ctx *, uint8 *, uint32);
void blf_ecb_decrypt(blf_ctx *, uint8 *, uint32);
void blf_cbc_encrypt(blf_ctx *, uint8 *, uint8 *, uint32);
void blf_cbc_decrypt(blf_ctx *, uint8 *, uint8 *, uint32);
#endif

24
contrib/pgcrypto/internal.c
View File

@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* $PostgreSQL: pgsql/contrib/pgcrypto/internal.c,v 1.25 2006/10/04 00:29:46 momjian Exp $ * $PostgreSQL: pgsql/contrib/pgcrypto/internal.c,v 1.26 2007/03/28 22:48:58 neilc Exp $
*/ */
#include "postgres.h" #include "postgres.h"
@ -251,7 +251,7 @@ struct int_ctx
uint8 iv[INT_MAX_IV]; uint8 iv[INT_MAX_IV];
union union
{ {
blf_ctx bf; BlowfishContext bf;
rijndael_ctx rj; rijndael_ctx rj;
} ctx; } ctx;
unsigned keylen; unsigned keylen;
@ -426,7 +426,7 @@ bf_block_size(PX_Cipher * c)
static unsigned static unsigned
bf_key_size(PX_Cipher * c) bf_key_size(PX_Cipher * c)
{ {
return BLF_MAXKEYLEN; return 448/8;
} }
static unsigned static unsigned
@ -440,9 +440,9 @@ bf_init(PX_Cipher * c, const uint8 *key, unsigned klen, const uint8 *iv)
{ {
struct int_ctx *cx = (struct int_ctx *) c->ptr; struct int_ctx *cx = (struct int_ctx *) c->ptr;
blf_key(&cx->ctx.bf, key, klen); blowfish_setkey(&cx->ctx.bf, key, klen);
if (iv) if (iv)
memcpy(cx->iv, iv, 8); blowfish_setiv(&cx->ctx.bf, iv);
return 0; return 0;
} }
@ -451,6 +451,7 @@ static int
bf_encrypt(PX_Cipher * c, const uint8 *data, unsigned dlen, uint8 *res) bf_encrypt(PX_Cipher * c, const uint8 *data, unsigned dlen, uint8 *res)
{ {
struct int_ctx *cx = (struct int_ctx *) c->ptr; struct int_ctx *cx = (struct int_ctx *) c->ptr;
BlowfishContext *bfctx = &cx->ctx.bf;
if (dlen == 0) if (dlen == 0)
return 0; return 0;
@ -462,11 +463,11 @@ bf_encrypt(PX_Cipher * c, const uint8 *data, unsigned dlen, uint8 *res)
switch (cx->mode) switch (cx->mode)
{ {
case MODE_ECB: case MODE_ECB:
blf_ecb_encrypt(&cx->ctx.bf, res, dlen); blowfish_encrypt_ecb(res, dlen, bfctx);
break; break;
case MODE_CBC: case MODE_CBC:
blf_cbc_encrypt(&cx->ctx.bf, cx->iv, res, dlen); blowfish_encrypt_cbc(res, dlen, bfctx);
memcpy(cx->iv, res + dlen - 8, 8); break;
} }
return 0; return 0;
} }
@ -475,6 +476,7 @@ static int
bf_decrypt(PX_Cipher * c, const uint8 *data, unsigned dlen, uint8 *res) bf_decrypt(PX_Cipher * c, const uint8 *data, unsigned dlen, uint8 *res)
{ {
struct int_ctx *cx = (struct int_ctx *) c->ptr; struct int_ctx *cx = (struct int_ctx *) c->ptr;
BlowfishContext *bfctx = &cx->ctx.bf;
if (dlen == 0) if (dlen == 0)
return 0; return 0;
@ -486,11 +488,11 @@ bf_decrypt(PX_Cipher * c, const uint8 *data, unsigned dlen, uint8 *res)
switch (cx->mode) switch (cx->mode)
{ {
case MODE_ECB: case MODE_ECB:
blf_ecb_decrypt(&cx->ctx.bf, res, dlen); blowfish_decrypt_ecb(res, dlen, bfctx);
break; break;
case MODE_CBC: case MODE_CBC:
blf_cbc_decrypt(&cx->ctx.bf, cx->iv, res, dlen); blowfish_decrypt_cbc(res, dlen, bfctx);
memcpy(cx->iv, data + dlen - 8, 8); break;
} }
return 0; return 0;
} }