From ff22df538ef29d0596c9bff03f3c93fcd37ffb6e Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Thu, 13 Jan 2011 21:05:27 +1100 Subject: - (djm) [entropy.c] cast OPENSSL_VERSION_NUMBER to u_long to avoid gcc warning on platforms where it defaults to int --- ChangeLog | 2 ++ entropy.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 2cc303de..438c2cdd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,8 @@ - (tim) [Makefile.in] test the ECC bits if we have the capability. ok djm - (tim) [Makefile.in configure.ac opensshd.init.in] Add support for generating ecdsa keys. ok djm. + - (djm) [entropy.c] cast OPENSSL_VERSION_NUMBER to u_long to avoid + gcc warning on platforms where it defaults to int 20110212 - OpenBSD CVS Sync diff --git a/entropy.c b/entropy.c index 8b705397..a8216625 100644 --- a/entropy.c +++ b/entropy.c @@ -157,7 +157,7 @@ init_rng(void) */ if ((SSLeay() ^ OPENSSL_VERSION_NUMBER) & ~0xff0L) fatal("OpenSSL version mismatch. Built against %lx, you " - "have %lx", OPENSSL_VERSION_NUMBER, SSLeay()); + "have %lx", (u_long)OPENSSL_VERSION_NUMBER, SSLeay()); #ifndef OPENSSL_PRNG_ONLY original_uid = getuid(); -- cgit v1.2.3