diff options
author | Damien Miller <djm@mindrot.org> | 2011-01-13 21:05:27 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2011-01-13 21:05:27 +1100 |
commit | ff22df538ef29d0596c9bff03f3c93fcd37ffb6e (patch) | |
tree | dd718657cf143a53829b75d4c348bb3631f7a209 | |
parent | 9b87a5ce3ca693c257c6097fb4c6906910b1900b (diff) |
- (djm) [entropy.c] cast OPENSSL_VERSION_NUMBER to u_long to avoid
gcc warning on platforms where it defaults to int
-rw-r--r-- | ChangeLog | 2 | ||||
-rw-r--r-- | entropy.c | 2 |
2 files changed, 3 insertions, 1 deletions
@@ -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 | ||
7 | 20110212 | 9 | 20110212 |
8 | - OpenBSD CVS Sync | 10 | - OpenBSD CVS Sync |
@@ -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(); |