* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $PostgreSQL: pgsql/contrib/pgcrypto/fortuna.c,v 1.2 2005/07/11 15:07:59 tgl Exp $
+ * $PostgreSQL: pgsql/contrib/pgcrypto/fortuna.c,v 1.3 2005/07/18 17:09:01 tgl Exp $
*/
#include "postgres.h"
}
/*
- * Must not reseed more ofter than RESEED_PER_SEC
- * times per second.
+ * The time between reseed must be at least RESEED_INTERVAL
+ * microseconds.
*/
static int too_often(FState *st)
{
memset(&key_md, 0, sizeof(key_md));
memset(buf, 0, BLOCK);
- n = k = 0;
}
/*
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $PostgreSQL: pgsql/contrib/pgcrypto/internal.c,v 1.20 2005/07/11 15:07:59 tgl Exp $
+ * $PostgreSQL: pgsql/contrib/pgcrypto/internal.c,v 1.21 2005/07/18 17:09:01 tgl Exp $
*/
#include "postgres.h"
{
MD5_CTX *ctx = (MD5_CTX *) h->p.ptr;
+ memset(ctx, 0, sizeof(*ctx));
px_free(ctx);
px_free(h);
}
{
SHA1_CTX *ctx = (SHA1_CTX *) h->p.ptr;
+ memset(ctx, 0, sizeof(*ctx));
px_free(ctx);
px_free(h);
}
{
SHA256_CTX *ctx = (SHA256_CTX *) h->p.ptr;
+ memset(ctx, 0, sizeof(*ctx));
px_free(ctx);
px_free(h);
}
{
SHA384_CTX *ctx = (SHA384_CTX *) h->p.ptr;
+ memset(ctx, 0, sizeof(*ctx));
px_free(ctx);
px_free(h);
}
{
SHA512_CTX *ctx = (SHA512_CTX *) h->p.ptr;
+ memset(ctx, 0, sizeof(*ctx));
px_free(ctx);
px_free(h);
}
MD5_CTX *ctx;
ctx = px_alloc(sizeof(*ctx));
+ memset(ctx, 0, sizeof(*ctx));
md->p.ptr = ctx;
SHA1_CTX *ctx;
ctx = px_alloc(sizeof(*ctx));
+ memset(ctx, 0, sizeof(*ctx));
md->p.ptr = ctx;
SHA256_CTX *ctx;
ctx = px_alloc(sizeof(*ctx));
+ memset(ctx, 0, sizeof(*ctx));
md->p.ptr = ctx;
SHA384_CTX *ctx;
ctx = px_alloc(sizeof(*ctx));
+ memset(ctx, 0, sizeof(*ctx));
md->p.ptr = ctx;
SHA512_CTX *ctx;
ctx = px_alloc(sizeof(*ctx));
+ memset(ctx, 0, sizeof(*ctx));
md->p.ptr = ctx;
fortuna_add_entropy(SYSTEM_ENTROPY, buf, n);
seed_time = t;
+ memset(buf, 0, sizeof(buf));
}
int
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $PostgreSQL: pgsql/contrib/pgcrypto/pgp-compress.c,v 1.3 2005/07/18 16:35:06 tgl Exp $
+ * $PostgreSQL: pgsql/contrib/pgcrypto/pgp-compress.c,v 1.4 2005/07/18 17:09:01 tgl Exp $
*/
#include "postgres.h"
dec->stream.avail_out = dec->buf_len;
dec->pos = dec->buf;
- /* Z_NO_FLUSH, Z_SYNC_FLUSH */
+ /*
+ * Z_SYNC_FLUSH is tell zlib to output as much as possible.
+ * It should do it anyway (Z_NO_FLUSH), but seems to reserve
+ * the right not to. So lets follow the API.
+ */
flush = dec->stream.avail_in ? Z_SYNC_FLUSH : Z_FINISH;
res = inflate(&dec->stream, flush);
if (res != Z_OK && res != Z_STREAM_END)
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $PostgreSQL: pgsql/contrib/pgcrypto/pgp-decrypt.c,v 1.3 2005/07/18 16:35:06 tgl Exp $
+ * $PostgreSQL: pgsql/contrib/pgcrypto/pgp-decrypt.c,v 1.4 2005/07/18 17:09:01 tgl Exp $
*/
#include "postgres.h"
ctx->mdc_ctx = NULL;
}
-/* fixme: clarify */
static int mdc_finish(PGP_Context *ctx, PullFilter *src,
int len, uint8 **data_p)
{
return 0;
}
+ /* safety check */
if (ctx->in_mdc_pkt > 1)
{
px_debug("mdc_finish: several times here?");
}
ctx->in_mdc_pkt++;
+ /* is the packet sane? */
if (res != 20)
{
px_debug("mdc_finish: read failed, res=%d", res);
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $PostgreSQL: pgsql/contrib/pgcrypto/pgp.h,v 1.1 2005/07/10 13:46:29 momjian Exp $
+ * $PostgreSQL: pgsql/contrib/pgcrypto/pgp.h,v 1.2 2005/07/18 17:09:01 tgl Exp $
*/
enum
int pgp_compress_filter(PushFilter **res, PGP_Context *ctx, PushFilter *dst);
int pgp_decompress_filter(PullFilter **res, PGP_Context *ctx, PullFilter *src);
-extern void (*pgp_packet_debug) (int tag, uint8 *buf, int len);
-
int pgp_key_alloc(PGP_PubKey **pk_p);
void pgp_key_free(PGP_PubKey *pk);
int _pgp_read_public_key(PullFilter *pkt, PGP_PubKey *pk);
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $PostgreSQL: pgsql/contrib/pgcrypto/random.c,v 1.14 2005/07/11 19:06:46 tgl Exp $
+ * $PostgreSQL: pgsql/contrib/pgcrypto/random.c,v 1.15 2005/07/18 17:09:01 tgl Exp $
*/
#include "postgres.h"
*/
#if defined(__linux__) || defined(__FreeBSD__) || defined(__OpenBSD__) \
|| defined(__NetBSD__) || defined(__DragonFly__) \
- || defined(__darwin__) || defined(__SOLARIS__)
+ || defined(__darwin__) || defined(__SOLARIS__) \
+ || defined(__hpux) || defined(__HPUX__) \
+ || defined(__CYGWIN__) || defined(_AIX)
#define TRY_DEV_RANDOM