diff options
| author | marha <marha@users.sourceforge.net> | 2014-04-14 23:15:59 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-04-14 23:15:59 +0200 |
| commit | 242d48135a12fc9167430f391ba0d27d9ad44c6b (patch) | |
| tree | 95c65b0c4b195842adfd8dcf4c10c8f46b24e044 /openssl/crypto/rand | |
| parent | d2ad10d03be8e6d4b150bbdf2a28ea3d5a18a2ed (diff) | |
| download | vcxsrv-242d48135a12fc9167430f391ba0d27d9ad44c6b.tar.gz vcxsrv-242d48135a12fc9167430f391ba0d27d9ad44c6b.tar.bz2 vcxsrv-242d48135a12fc9167430f391ba0d27d9ad44c6b.zip | |
Updated openssl to version 1.0.1g
Diffstat (limited to 'openssl/crypto/rand')
| -rw-r--r-- | openssl/crypto/rand/md_rand.c | 3 | ||||
| -rw-r--r-- | openssl/crypto/rand/rand_win.c | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/openssl/crypto/rand/md_rand.c b/openssl/crypto/rand/md_rand.c index dd2916372..aee1c30b0 100644 --- a/openssl/crypto/rand/md_rand.c +++ b/openssl/crypto/rand/md_rand.c @@ -198,6 +198,9 @@ static void ssleay_rand_add(const void *buf, int num, double add) EVP_MD_CTX m; int do_not_lock; + if (!num) + return; + /* * (Based on the rand(3) manpage) * diff --git a/openssl/crypto/rand/rand_win.c b/openssl/crypto/rand/rand_win.c index 5d134e186..34ffcd23f 100644 --- a/openssl/crypto/rand/rand_win.c +++ b/openssl/crypto/rand/rand_win.c @@ -750,7 +750,7 @@ static void readscreen(void) int y; /* y-coordinate of screen lines to grab */ int n = 16; /* number of screen lines to grab at a time */ - if (GetVersion() < 0x80000000 && OPENSSL_isservice()>0) + if (check_winnt() && OPENSSL_isservice()>0) return; /* Create a screen DC and a memory DC compatible to screen DC */ |