summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog2
-rw-r--r--entropy.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 2cc303de0..438c2cdd7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,8 @@
3 - (tim) [Makefile.in] test the ECC bits if we have the capability. ok djm 3 - (tim) [Makefile.in] test the ECC bits if we have the capability. ok djm
4 - (tim) [Makefile.in configure.ac opensshd.init.in] Add support for generating 4 - (tim) [Makefile.in configure.ac opensshd.init.in] Add support for generating
5 ecdsa keys. ok djm. 5 ecdsa keys. ok djm.
6 - (djm) [entropy.c] cast OPENSSL_VERSION_NUMBER to u_long to avoid
7 gcc warning on platforms where it defaults to int
6 8
720110212 920110212
8 - OpenBSD CVS Sync 10 - OpenBSD CVS Sync
diff --git a/entropy.c b/entropy.c
index 8b705397f..a82166258 100644
--- a/entropy.c
+++ b/entropy.c
@@ -157,7 +157,7 @@ init_rng(void)
157 */ 157 */
158 if ((SSLeay() ^ OPENSSL_VERSION_NUMBER) & ~0xff0L) 158 if ((SSLeay() ^ OPENSSL_VERSION_NUMBER) & ~0xff0L)
159 fatal("OpenSSL version mismatch. Built against %lx, you " 159 fatal("OpenSSL version mismatch. Built against %lx, you "
160 "have %lx", OPENSSL_VERSION_NUMBER, SSLeay()); 160 "have %lx", (u_long)OPENSSL_VERSION_NUMBER, SSLeay());
161 161
162#ifndef OPENSSL_PRNG_ONLY 162#ifndef OPENSSL_PRNG_ONLY
163 original_uid = getuid(); 163 original_uid = getuid();