Commit 70d71f61 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Fix warnings: printf format mismatches on 64 bit platforms. 

Change assert to OPENSSL_assert().
Fix e_padlock prototype.
parent 5ee92a5e

apps/s_cb.c

+4 −4
Original line number Diff line number Diff line
@@ -269,15 +269,15 @@ long MS_CALLBACK bio_dump_callback(BIO *bio, int cmd, const char *argp, 


	if (cmd == (BIO_CB_READ|BIO_CB_RETURN))

		{

		BIO_printf(out,"read from %p [%p] (%d bytes => %ld (0x%lX))\n",

 			(void *)bio,argp,argi,ret,ret);

		BIO_printf(out,"read from %p [%p] (%lu bytes => %ld (0x%lX))\n",

 			(void *)bio,argp,(unsigned long)argi,ret,ret);

		BIO_dump(out,argp,(int)ret);

		return(ret);

		}

	else if (cmd == (BIO_CB_WRITE|BIO_CB_RETURN))

		{

		BIO_printf(out,"write to %p [%p] (%d bytes => %ld (0x%lX))\n",

			(void *)bio,argp,argi,ret,ret);

		BIO_printf(out,"write to %p [%p] (%lu bytes => %ld (0x%lX))\n",

			(void *)bio,argp,(unsigned long)argi,ret,ret);

		BIO_dump(out,argp,(int)ret);

		}

	return(ret);

crypto/bio/bio_cb.c

+14 −10
Original line number Diff line number Diff line
@@ -85,28 +85,32 @@ long MS_CALLBACK BIO_debug_callback(BIO *bio, int cmd, const char *argp, 
		break;

	case BIO_CB_READ:

		if (bio->method->type & BIO_TYPE_DESCRIPTOR)

			BIO_snprintf(p,p_maxlen,"read(%d,%d) - %s fd=%d\n",

				 bio->num,argi,bio->method->name,bio->num);

			BIO_snprintf(p,p_maxlen,"read(%d,%lu) - %s fd=%d\n",

				 bio->num,(unsigned long)argi,

				 bio->method->name,bio->num);

		else

			BIO_snprintf(p,p_maxlen,"read(%d,%d) - %s\n",

				 bio->num,argi,bio->method->name);

			BIO_snprintf(p,p_maxlen,"read(%d,%lu) - %s\n",

				 bio->num,(unsigned long)argi,

				 bio->method->name);

		break;

	case BIO_CB_WRITE:

		if (bio->method->type & BIO_TYPE_DESCRIPTOR)

			BIO_snprintf(p,p_maxlen,"write(%d,%d) - %s fd=%d\n",

				 bio->num,argi,bio->method->name,bio->num);

			BIO_snprintf(p,p_maxlen,"write(%d,%lu) - %s fd=%d\n",

				 bio->num,(unsigned long)argi,

				 bio->method->name,bio->num);

		else

			BIO_snprintf(p,p_maxlen,"write(%d,%d) - %s\n",

				 bio->num,argi,bio->method->name);

			BIO_snprintf(p,p_maxlen,"write(%d,%lu) - %s\n",

				 bio->num,(unsigned long)argi,

				 bio->method->name);

		break;

	case BIO_CB_PUTS:

		BIO_snprintf(p,p_maxlen,"puts() - %s\n",bio->method->name);

		break;

	case BIO_CB_GETS:

		BIO_snprintf(p,p_maxlen,"gets(%d) - %s\n",argi,bio->method->name);

		BIO_snprintf(p,p_maxlen,"gets(%lu) - %s\n",(unsigned long)argi,bio->method->name);

		break;

	case BIO_CB_CTRL:

		BIO_snprintf(p,p_maxlen,"ctrl(%d) - %s\n",argi,bio->method->name);

		BIO_snprintf(p,p_maxlen,"ctrl(%lu) - %s\n",(unsigned long)argi,bio->method->name);

		break;

	case BIO_CB_RETURN|BIO_CB_READ:

		BIO_snprintf(p,p_maxlen,"read return %ld\n",ret);

crypto/evp/evp_test.c

+2 −2
Original line number Diff line number Diff line
@@ -153,8 +153,8 @@ static void test1(const EVP_CIPHER *c,const unsigned char *key,int kn, 
    

    if(kn != c->key_len)

	{

	fprintf(stderr,"Key length doesn't match, got %d expected %d\n",kn,

		c->key_len);

	fprintf(stderr,"Key length doesn't match, got %d expected %lu\n",kn,

		(unsigned long)c->key_len);

	test1_exit(5);

	}

    EVP_CIPHER_CTX_init(&ctx);

crypto/jpake/jpake.c

+2 −3
Original line number Diff line number Diff line
@@ -4,7 +4,6 @@ 
#include <openssl/sha.h>

#include <openssl/err.h>

#include <memory.h>

#include <assert.h>



/*

 * In the definition, (xa, xb, xc, xd) are Alice's (x1, x2, x3, x4) or
@@ -134,7 +133,7 @@ static void hashlength(SHA_CTX *sha, size_t l) 
    {

    unsigned char b[2];



    assert(l <= 0xffff);

    OPENSSL_assert(l <= 0xffff);

    b[0] = l >> 8;

    b[1] = l&0xff;

    SHA1_Update(sha, b, 2);
@@ -172,7 +171,7 @@ static void zkp_hash(BIGNUM *h, const BIGNUM *zkpg, const JPAKE_STEP_PART *p, 
    */

    SHA1_Init(&sha);

    hashbn(&sha, zkpg);

    assert(!BN_is_zero(p->zkpx.gr));

    OPENSSL_assert(!BN_is_zero(p->zkpx.gr));

    hashbn(&sha, p->zkpx.gr);

    hashbn(&sha, p->gx);

    hashstring(&sha, proof_name);

engines/e_padlock.c

+1 −1
Original line number Diff line number Diff line
@@ -1169,7 +1169,7 @@ padlock_aes_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out_arg, 
/* Wrapper that provides an interface between the API and 

   the raw PadLock RNG */

static int

padlock_rand_bytes(unsigned char *output, int count)

padlock_rand_bytes(unsigned char *output, size_t count)

{

	unsigned int eax, buf;