From 6343829a391df59e46e513c84b6264ee71ad9518 Mon Sep 17 00:00:00 2001 From: Geoff Thorpe Date: Wed, 12 Nov 2008 03:58:08 +0000 Subject: Revert the size_t modifications from HEAD that had led to more knock-on work than expected - they've been extracted into a patch series that can be completed elsewhere, or in a different branch, before merging back to HEAD. --- crypto/dh/dh.h | 2 +- crypto/dh/dh_ameth.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'crypto/dh') diff --git a/crypto/dh/dh.h b/crypto/dh/dh.h index c3f297e2be..b0332f2c0c 100644 --- a/crypto/dh/dh.h +++ b/crypto/dh/dh.h @@ -194,7 +194,7 @@ int DH_check(const DH *dh,int *codes); int DH_check_pub_key(const DH *dh,const BIGNUM *pub_key, int *codes); int DH_generate_key(DH *dh); int DH_compute_key(unsigned char *key,const BIGNUM *pub_key,DH *dh); -DH * d2i_DHparams(DH **a,const unsigned char **pp, size_t length); +DH * d2i_DHparams(DH **a,const unsigned char **pp, long length); int i2d_DHparams(const DH *a,unsigned char **pp); #ifndef OPENSSL_NO_FP_API int DHparams_print_fp(FILE *fp, const DH *x); diff --git a/crypto/dh/dh_ameth.c b/crypto/dh/dh_ameth.c index f008c88cf1..377caf96c9 100644 --- a/crypto/dh/dh_ameth.c +++ b/crypto/dh/dh_ameth.c @@ -296,7 +296,7 @@ static void update_buflen(const BIGNUM *b, size_t *pbuflen) } static int dh_param_decode(EVP_PKEY *pkey, - const unsigned char **pder, size_t derlen) + const unsigned char **pder, int derlen) { DH *dh; if (!(dh = d2i_DHparams(NULL, pder, derlen))) -- cgit v1.2.3