parent
7bbf448378
commit
17e5b407a3
@ -0,0 +1,12 @@
|
||||
diff --git a/src/worker-privs.c b/src/worker-privs.c
|
||||
index ae0b375d..0b285113 100644
|
||||
--- a/src/worker-privs.c
|
||||
+++ b/src/worker-privs.c
|
||||
@@ -128,6 +128,7 @@ int disable_system_calls(struct worker_st *ws)
|
||||
ADD_SYSCALL(getrusage, 0);
|
||||
ADD_SYSCALL(alarm, 0);
|
||||
ADD_SYSCALL(getpid, 0);
|
||||
+ ADD_SYSCALL(futex, 0);
|
||||
|
||||
/* memory allocation - both are used by different platforms */
|
||||
ADD_SYSCALL(brk, 0);
|
@ -0,0 +1,16 @@
|
||||
diff --git a/src/sec-mod.c b/src/sec-mod.c
|
||||
index 03f78276..6492b68a 100644
|
||||
--- a/src/sec-mod.c
|
||||
+++ b/src/sec-mod.c
|
||||
@@ -834,7 +834,10 @@ static int load_keys(sec_mod_st *sec, unsigned force)
|
||||
gnutls_privkey_import_x509_raw(p, &data,
|
||||
GNUTLS_X509_FMT_PEM,
|
||||
NULL, 0);
|
||||
- if (ret == GNUTLS_E_DECRYPTION_FAILED && vhost->pins.pin[0]) {
|
||||
+ /* GnuTLS 3.7.3 introduces a backwards incompatible change and
|
||||
+ * GNUTLS_E_PKCS11_PIN_ERROR is returned when an encrypted
|
||||
+ * file is loaded https://gitlab.com/gnutls/gnutls/-/issues/1321 */
|
||||
+ if ((ret == GNUTLS_E_DECRYPTION_FAILED || ret == GNUTLS_E_PKCS11_PIN_ERROR) && vhost->pins.pin[0]) {
|
||||
ret =
|
||||
gnutls_privkey_import_x509_raw(p, &data,
|
||||
GNUTLS_X509_FMT_PEM,
|
Loading…
Reference in new issue