diff options
author | Dr. Stephen Henson <steve@openssl.org> | 2008-11-02 15:41:30 +0000 |
---|---|---|
committer | Dr. Stephen Henson <steve@openssl.org> | 2008-11-02 15:41:30 +0000 |
commit | 70d71f61853f67dad75abce42c63e3b71704a763 (patch) | |
tree | 1bea383ea46c80fbee7e41ab5be1a8f1de8b7b1b /crypto/jpake | |
parent | 5ee92a5ec1c743b5d3b5d2c7558d0f39e302b7e7 (diff) |
Fix warnings: printf format mismatches on 64 bit platforms.
Change assert to OPENSSL_assert().
Fix e_padlock prototype.
Diffstat (limited to 'crypto/jpake')
-rw-r--r-- | crypto/jpake/jpake.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/crypto/jpake/jpake.c b/crypto/jpake/jpake.c index 577b7ef375..086d9f47e0 100644 --- a/crypto/jpake/jpake.c +++ b/crypto/jpake/jpake.c @@ -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); |