Commit a51a9726 authored by Ben Laurie's avatar Ben Laurie
Browse files

Brought forward from 0.9.8 - 64 bit warning fixes and fussy compiler fixes.

parent 45d8574b

apps/passwd.c

+2 −1
Original line number Diff line number Diff line
@@ -474,7 +474,8 @@ static int do_passwd(int passed_salt, char **salt_p, char **salt_malloc_p, 
	if ((strlen(passwd) > pw_maxlen))

		{

		if (!quiet)

			BIO_printf(bio_err, "Warning: truncating password to %u characters\n", pw_maxlen);

			/* XXX: really we should know how to print a size_t, not cast it */

			BIO_printf(bio_err, "Warning: truncating password to %u characters\n", (unsigned)pw_maxlen);

		passwd[pw_maxlen] = 0;

		}

	assert(strlen(passwd) <= pw_maxlen);

crypto/bn/bn_nist.c

+6 −0
Original line number Diff line number Diff line
@@ -172,6 +172,7 @@ const BIGNUM *BN_get0_nist_prime_521(void) 
	}



/* some misc internal functions */

#if BN_BITS2 != 64

static BN_ULONG _256_data[BN_NIST_256_TOP*6];

static int _is_set_256_data = 0;

static void _init_256_data(void);
@@ -179,6 +180,7 @@ static void _init_256_data(void); 
static BN_ULONG _384_data[BN_NIST_384_TOP*8];

static int _is_set_384_data = 0;

static void _init_384_data(void);

#endif



#define BN_NIST_ADD_ONE(a)	while (!(++(*(a)))) ++(a);
@@ -405,6 +407,7 @@ int BN_nist_mod_224(BIGNUM *r, const BIGNUM *a, const BIGNUM *field, 
#endif

	}



#if BN_BITS2 != 64

static void _init_256_data(void)

	{

	int	i;
@@ -422,6 +425,7 @@ static void _init_256_data(void) 
		}

	_is_set_256_data = 1;

	}

#endif



#define nist_set_256(to, from, a1, a2, a3, a4, a5, a6, a7, a8) \

	{ \
@@ -555,6 +559,7 @@ int BN_nist_mod_256(BIGNUM *r, const BIGNUM *a, const BIGNUM *field, 
#endif

	}



#if BN_BITS2 != 64

static void _init_384_data(void)

	{

	int	i;
@@ -572,6 +577,7 @@ static void _init_384_data(void) 
		}

	_is_set_384_data = 1;

	}

#endif



#define nist_set_384(to,from,a1,a2,a3,a4,a5,a6,a7,a8,a9,a10,a11,a12) \

	{ \

crypto/pqueue/pq_compat.h

+2 −0
Original line number Diff line number Diff line
@@ -111,8 +111,10 @@ 


#if defined(SIXTY_FOUR_BIT) || defined(SIXTY_FOUR_BIT_LONG)

#define PQ_64BIT BN_ULONG

#define PQ_64BIT_PRINT "%ld"

#elif defined(THIRTY_TWO_BIT)

#define PQ_64BIT BN_ULLONG

#define PQ_64BIT_PRINT "%lld"

#endif



#define PQ_64BIT_CTX      void

ssl/ssltest.c

+8 −8
Original line number Diff line number Diff line
@@ -1694,7 +1694,7 @@ static int MS_CALLBACK verify_callback(int ok, X509_STORE_CTX *ctx) 
					fprintf(stderr, "  Certificate proxy rights = %*.*s", i, i, s);

					while(i-- > 0)

						{

						char c = *s++;

						int c = *s++;

						if (isascii(c) && isalpha(c))

							{

							if (islower(c))
@@ -1755,11 +1755,11 @@ static int process_proxy_cond_adders(unsigned int letters[26], 
static int process_proxy_cond_val(unsigned int letters[26],

	const char *cond, const char **cond_end, int *pos, int indent)

	{

	char c;

	int c;

	int ok = 1;

	int negate = 0;



	while(isspace(*cond))

	while(isspace((int)*cond))

		{

		cond++; (*pos)++;

		}
@@ -1774,7 +1774,7 @@ static int process_proxy_cond_val(unsigned int letters[26], 
		{

		negate = !negate;

		cond++; (*pos)++;

		while(isspace(*cond))

		while(isspace((int)*cond))

			{

			cond++; (*pos)++;

			}
@@ -1789,7 +1789,7 @@ static int process_proxy_cond_val(unsigned int letters[26], 
		cond = *cond_end;

		if (ok < 0)

			goto end;

		while(isspace(*cond))

		while(isspace((int)*cond))

			{

			cond++; (*pos)++;

			}
@@ -1849,7 +1849,7 @@ static int process_proxy_cond_multipliers(unsigned int letters[26], 


	while(ok >= 0)

		{

		while(isspace(*cond))

		while(isspace((int)*cond))

			{

			cond++; (*pos)++;

			}
@@ -1916,7 +1916,7 @@ static int process_proxy_cond_adders(unsigned int letters[26], 


	while(ok >= 0)

		{

		while(isspace(*cond))

		while(isspace((int)*cond))

			{

			cond++; (*pos)++;

			}
@@ -1999,7 +1999,7 @@ static int MS_CALLBACK app_verify_callback(X509_STORE_CTX *ctx, void *arg) 
			letters[i] = 0;

		for(sp = cb_arg->proxy_auth; *sp; sp++)

			{

			char c = *sp;

			int c = *sp;

			if (isascii(c) && isalpha(c))

				{

				if (islower(c))