summaryrefslogtreecommitdiff
path: root/main/openssl/crypto/rand
diff options
context:
space:
mode:
Diffstat (limited to 'main/openssl/crypto/rand')
-rw-r--r--main/openssl/crypto/rand/md_rand.c3
-rw-r--r--main/openssl/crypto/rand/rand_win.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/main/openssl/crypto/rand/md_rand.c b/main/openssl/crypto/rand/md_rand.c
index dd291637..aee1c30b 100644
--- a/main/openssl/crypto/rand/md_rand.c
+++ b/main/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/main/openssl/crypto/rand/rand_win.c b/main/openssl/crypto/rand/rand_win.c
index 5d134e18..34ffcd23 100644
--- a/main/openssl/crypto/rand/rand_win.c
+++ b/main/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 */