Mercurial > hg > orthanc
annotate Resources/Patches/openssl-1.1.1f.patch @ 3829:4fde7933e504 transcoding
integration mainline->transcoding
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Fri, 10 Apr 2020 16:36:02 +0200 |
parents | cdb429340112 |
children |
rev | line source |
---|---|
3803
e9834343d327
upgrade to openssl 1.1.1f
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1 diff -urEb openssl-1.1.1f.orig/crypto/rand/rand_unix.c openssl-1.1.1f/crypto/rand/rand_unix.c |
3805
cdb429340112
Fix OpenSSL initialization on Linux Standard Base
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3803
diff
changeset
|
2 --- openssl-1.1.1f.orig/crypto/rand/rand_unix.c 2020-03-31 14:17:45.000000000 +0200 |
cdb429340112
Fix OpenSSL initialization on Linux Standard Base
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3803
diff
changeset
|
3 +++ openssl-1.1.1f/crypto/rand/rand_unix.c 2020-04-02 16:38:56.091240847 +0200 |
cdb429340112
Fix OpenSSL initialization on Linux Standard Base
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3803
diff
changeset
|
4 @@ -445,6 +445,7 @@ |
cdb429340112
Fix OpenSSL initialization on Linux Standard Base
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3803
diff
changeset
|
5 * system call and this should always succeed which renders |
cdb429340112
Fix OpenSSL initialization on Linux Standard Base
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3803
diff
changeset
|
6 * this alternative but essentially identical source moot. |
cdb429340112
Fix OpenSSL initialization on Linux Standard Base
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3803
diff
changeset
|
7 */ |
cdb429340112
Fix OpenSSL initialization on Linux Standard Base
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3803
diff
changeset
|
8 +#if !defined(__LSB_VERSION__) // "syscall()" is not available in LSB |
cdb429340112
Fix OpenSSL initialization on Linux Standard Base
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3803
diff
changeset
|
9 if (uname(&un) == 0) { |
cdb429340112
Fix OpenSSL initialization on Linux Standard Base
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3803
diff
changeset
|
10 kernel[0] = atoi(un.release); |
cdb429340112
Fix OpenSSL initialization on Linux Standard Base
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3803
diff
changeset
|
11 p = strchr(un.release, '.'); |
cdb429340112
Fix OpenSSL initialization on Linux Standard Base
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3803
diff
changeset
|
12 @@ -455,6 +456,7 @@ |
cdb429340112
Fix OpenSSL initialization on Linux Standard Base
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3803
diff
changeset
|
13 return 0; |
cdb429340112
Fix OpenSSL initialization on Linux Standard Base
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3803
diff
changeset
|
14 } |
cdb429340112
Fix OpenSSL initialization on Linux Standard Base
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3803
diff
changeset
|
15 } |
cdb429340112
Fix OpenSSL initialization on Linux Standard Base
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3803
diff
changeset
|
16 +#endif |
cdb429340112
Fix OpenSSL initialization on Linux Standard Base
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3803
diff
changeset
|
17 /* Open /dev/random and wait for it to be readable */ |
cdb429340112
Fix OpenSSL initialization on Linux Standard Base
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3803
diff
changeset
|
18 if ((fd = open(DEVRANDOM_WAIT, O_RDONLY)) != -1) { |
cdb429340112
Fix OpenSSL initialization on Linux Standard Base
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3803
diff
changeset
|
19 if (DEVRANDM_WAIT_USE_SELECT && fd < FD_SETSIZE) { |