[openssl] master update

bernd.edlinger at hotmail.de bernd.edlinger at hotmail.de
Mon Aug 19 05:04:45 UTC 2019


The branch master has been updated
       via  24d932ec842bc5fdbd5e9b519cecf15a56bc74e6 (commit)
      from  784883fc2c8af035401f2a1e02a79aef41a2a7fb (commit)


- Log -----------------------------------------------------------------
commit 24d932ec842bc5fdbd5e9b519cecf15a56bc74e6
Author: Bernd Edlinger <bernd.edlinger at hotmail.de>
Date:   Sat Aug 17 13:22:07 2019 +0200

    Add a fallback definition for __NR_getrandom for ARM linux
    
    Reviewed-by: Paul Dale <paul.dale at oracle.com>
    (Merged from https://github.com/openssl/openssl/pull/9619)

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

Summary of changes:
 crypto/rand/rand_unix.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/crypto/rand/rand_unix.c b/crypto/rand/rand_unix.c
index e45e018e4a..de86e48f3a 100644
--- a/crypto/rand/rand_unix.c
+++ b/crypto/rand/rand_unix.c
@@ -254,6 +254,13 @@ static ssize_t sysctl_random(char *buf, size_t buflen)
 #  endif
 
 #  if defined(OPENSSL_RAND_SEED_GETRANDOM)
+
+#   if defined(__linux) && !defined(__NR_getrandom)
+#    if defined(__arm__) && defined(__NR_SYSCALL_BASE)
+#     define __NR_getrandom    (__NR_SYSCALL_BASE+384)
+#    endif
+#   endif
+
 /*
  * syscall_random(): Try to get random data using a system call
  * returns the number of bytes returned in buf, or < 0 on error.


More information about the openssl-commits mailing list