summaryrefslogtreecommitdiffstats
path: root/unit-syspol.patch
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2021-05-28 08:08:50 +0200
committerRemi Collet <remi@remirepo.net>2021-05-28 08:08:50 +0200
commit1010275d866be66d020a96bdf67c52f98e40fcaa (patch)
treeead847781fe355ea85f2ff32188a76acac02e11d /unit-syspol.patch
parent4cd44b85ecb86b3f3ac0909c9316ac5400a47044 (diff)
update to 1.24.0
Diffstat (limited to 'unit-syspol.patch')
-rw-r--r--unit-syspol.patch14
1 files changed, 7 insertions, 7 deletions
diff --git a/unit-syspol.patch b/unit-syspol.patch
index cff3889..c79025c 100644
--- a/unit-syspol.patch
+++ b/unit-syspol.patch
@@ -1,8 +1,8 @@
diff -up ./src/nxt_openssl.c.syspol ./src/nxt_openssl.c
---- ./src/nxt_openssl.c.syspol 2021-03-25 15:15:30.000000000 +0100
-+++ ./src/nxt_openssl.c 2021-03-26 07:46:53.897688835 +0100
-@@ -261,7 +261,7 @@ nxt_openssl_server_init(nxt_task_t *task
- nxt_mp_t *mp, nxt_bool_t last)
+--- ./src/nxt_openssl.c.syspol 2021-05-28 07:49:58.267866774 +0200
++++ ./src/nxt_openssl.c 2021-05-28 07:52:44.119844098 +0200
+@@ -269,7 +269,7 @@ nxt_openssl_server_init(nxt_task_t *task
+ nxt_mp_t *mp, nxt_conf_value_t *conf_cmds, nxt_bool_t last)
{
SSL_CTX *ctx;
- const char *ciphers, *ca_certificate;
@@ -10,10 +10,10 @@ diff -up ./src/nxt_openssl.c.syspol ./src/nxt_openssl.c
STACK_OF(X509_NAME) *list;
nxt_tls_bundle_conf_t *bundle;
-@@ -318,13 +318,13 @@ nxt_openssl_server_init(nxt_task_t *task
- goto fail;
+@@ -327,13 +327,13 @@ nxt_openssl_server_init(nxt_task_t *task
}
*/
+
- ciphers = (conf->ciphers != NULL) ? conf->ciphers : "HIGH:!aNULL:!MD5";
-
- if (SSL_CTX_set_cipher_list(ctx, ciphers) == 0) {
@@ -29,4 +29,4 @@ diff -up ./src/nxt_openssl.c.syspol ./src/nxt_openssl.c
+ }
}
- SSL_CTX_set_options(ctx, SSL_OP_CIPHER_SERVER_PREFERENCE);
+ #if (NXT_HAVE_OPENSSL_CONF_CMD)