Mercurial > hg > orthanc

annotate Resources/Patches/openssl-1.1.1d.patch @ 3745:113a7b994a12

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
extracting the raw frame in the transcoder
author Sebastien Jodogne <s.jodogne@gmail.com>
date Thu, 12 Mar 2020 21:48:35 +0100
parents faa695f433d5
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
3720
faa695f433d5 upgraded OpenSSL to 1.1.1d
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1 diff -urEb openssl-1.1.1d.orig/crypto/rand/rand_unix.c openssl-1.1.1d/crypto/rand/rand_unix.c
faa695f433d5 upgraded OpenSSL to 1.1.1d
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2 --- openssl-1.1.1d.orig/crypto/rand/rand_unix.c 2019-09-10 15:13:07.000000000 +0200
faa695f433d5 upgraded OpenSSL to 1.1.1d
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3 +++ openssl-1.1.1d/crypto/rand/rand_unix.c 2020-03-05 16:29:33.030136203 +0100
faa695f433d5 upgraded OpenSSL to 1.1.1d
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4 @@ -340,7 +340,7 @@
faa695f433d5 upgraded OpenSSL to 1.1.1d
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
5 # endif
faa695f433d5 upgraded OpenSSL to 1.1.1d
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
6
faa695f433d5 upgraded OpenSSL to 1.1.1d
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
7 /* Linux supports this since version 3.17 */
faa695f433d5 upgraded OpenSSL to 1.1.1d
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
8 -# if defined(__linux) && defined(__NR_getrandom)
faa695f433d5 upgraded OpenSSL to 1.1.1d
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
9 +# if defined(__linux) && defined(__NR_getrandom) && !defined(__LSB_VERSION__)
faa695f433d5 upgraded OpenSSL to 1.1.1d
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
10 return syscall(__NR_getrandom, buf, buflen, 0);
faa695f433d5 upgraded OpenSSL to 1.1.1d
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
11 # elif (defined(__FreeBSD__) || defined(__NetBSD__)) && defined(KERN_ARND)
faa695f433d5 upgraded OpenSSL to 1.1.1d
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
12 return sysctl_random(buf, buflen);