Mercurial > hg > orthanc

annotate Resources/Patches/openssl-1.1.1g.patch @ 3919:6f11b3233a06 transcoding

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
OrthancPluginTranscodeDicomInstance() and OrthancPluginSerializeDicomInstance()
author Sebastien Jodogne <s.jodogne@gmail.com>
date Tue, 12 May 2020 12:38:27 +0200
parents 35065dd39cc8
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
3890
35065dd39cc8 upgrade to openssl 1.1.1g
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1 diff -urEb openssl-1.1.1g.orig/crypto/rand/rand_unix.c openssl-1.1.1g/crypto/rand/rand_unix.c
35065dd39cc8 upgrade to openssl 1.1.1g
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2 --- openssl-1.1.1g.orig/crypto/rand/rand_unix.c 2020-05-05 17:58:08.785998440 +0200
35065dd39cc8 upgrade to openssl 1.1.1g
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3 +++ openssl-1.1.1g/crypto/rand/rand_unix.c 2020-05-05 17:58:55.201881117 +0200
35065dd39cc8 upgrade to openssl 1.1.1g
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4 @@ -445,6 +445,7 @@
35065dd39cc8 upgrade to openssl 1.1.1g
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
5 * system call and this should always succeed which renders
35065dd39cc8 upgrade to openssl 1.1.1g
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
6 * this alternative but essentially identical source moot.
35065dd39cc8 upgrade to openssl 1.1.1g
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
7 */
35065dd39cc8 upgrade to openssl 1.1.1g
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
8 +#if !defined(__LSB_VERSION__) // "syscall()" is not available in LSB
35065dd39cc8 upgrade to openssl 1.1.1g
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
9 if (uname(&un) == 0) {
35065dd39cc8 upgrade to openssl 1.1.1g
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
10 kernel[0] = atoi(un.release);
35065dd39cc8 upgrade to openssl 1.1.1g
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
11 p = strchr(un.release, '.');
35065dd39cc8 upgrade to openssl 1.1.1g
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
12 @@ -455,6 +456,7 @@
35065dd39cc8 upgrade to openssl 1.1.1g
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
13 return 0;
35065dd39cc8 upgrade to openssl 1.1.1g
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
14 }
35065dd39cc8 upgrade to openssl 1.1.1g
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
15 }
35065dd39cc8 upgrade to openssl 1.1.1g
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
16 +#endif
35065dd39cc8 upgrade to openssl 1.1.1g
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
17 /* Open /dev/random and wait for it to be readable */
35065dd39cc8 upgrade to openssl 1.1.1g
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
18 if ((fd = open(DEVRANDOM_WAIT, O_RDONLY)) != -1) {
35065dd39cc8 upgrade to openssl 1.1.1g
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
19 if (DEVRANDM_WAIT_USE_SELECT && fd < FD_SETSIZE) {