[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  8918a954bf7225ad2bc70d39f3a9fbd8fec8e233 (commit)
      from  b8a7bd83e68405fdf595077973035ac6fe24cb97 (commit)


- Log -----------------------------------------------------------------
commit 8918a954bf7225ad2bc70d39f3a9fbd8fec8e233
Author: Richard Levitte <levitte at openssl.org>
Date:   Fri Jul 15 17:57:35 2016 +0200

    Fix: dummy definition of rand_hw_seed() should also return int
    
    Reviewed-by: Stephen Henson <steve at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 crypto/rand/md_rand.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/crypto/rand/md_rand.c b/crypto/rand/md_rand.c
index 0d25aeb..9d39831 100644
--- a/crypto/rand/md_rand.c
+++ b/crypto/rand/md_rand.c
@@ -644,9 +644,9 @@ void rand_hw_xor(unsigned char *buf, size_t num)
 
 #else
 
-static void rand_hw_seed(EVP_MD_CTX *ctx)
+static int rand_hw_seed(EVP_MD_CTX *ctx)
 {
-    return;
+    return 1;
 }
 
 void rand_hw_xor(unsigned char *buf, size_t num)