[openssl] master update

bernd.edlinger at hotmail.de bernd.edlinger at hotmail.de
Mon Aug 19 14:06:24 UTC 2019


The branch master has been updated
       via  038b381ecf2a988eee4c7bb21074ed0603303bd1 (commit)
      from  81ff9eebbcf15ce04b52cc4257b265617ba412eb (commit)


- Log -----------------------------------------------------------------
commit 038b381ecf2a988eee4c7bb21074ed0603303bd1
Author: Bernd Edlinger <bernd.edlinger at hotmail.de>
Date:   Mon Aug 19 08:25:07 2019 +0200

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

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

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

diff --git a/crypto/rand/rand_unix.c b/crypto/rand/rand_unix.c
index de86e48f3a..bf5c4c3499 100644
--- a/crypto/rand/rand_unix.c
+++ b/crypto/rand/rand_unix.c
@@ -258,6 +258,10 @@ static ssize_t sysctl_random(char *buf, size_t buflen)
 #   if defined(__linux) && !defined(__NR_getrandom)
 #    if defined(__arm__) && defined(__NR_SYSCALL_BASE)
 #     define __NR_getrandom    (__NR_SYSCALL_BASE+384)
+#    elif defined(__i386__)
+#     define __NR_getrandom    355
+#    elif defined(__x86_64__) && !defined(__ILP32__)
+#     define __NR_getrandom    318
 #    endif
 #   endif
 


More information about the openssl-commits mailing list