diff options
| author | Arne Schwabe <arne@rfc2549.org> | 2014-04-23 12:31:35 +0200 |
|---|---|---|
| committer | Arne Schwabe <arne@rfc2549.org> | 2014-04-23 12:31:35 +0200 |
| commit | 0c5af0c28f23f75f93e253aeccb00c5ad20c116e (patch) | |
| tree | fae9826018c36f1011007d029b728c290c50485c /main/openssl/crypto/rand | |
| parent | c69ba1780496c260a1b4498596bae428e0df232d (diff) | |
Update OpenSSL to 1.0.1g
Diffstat (limited to 'main/openssl/crypto/rand')
| -rw-r--r-- | main/openssl/crypto/rand/md_rand.c | 3 | ||||
| -rw-r--r-- | main/openssl/crypto/rand/rand_win.c | 2 |
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 */ |