Mercurial > hg > nginx-tests

changeset 1328:a682c219af45

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Tests: updated ssl_engine_keys.t test. After merge with libp11, pkcs11 engine shared object was renamed from "engine_pkcs11.so" to "pkcs11.so". Changed configuration accordingly. Additionally, changed "init" to "1" in the engine configuration. This keeps pkcs11 engine loaded and prevents segmentation faults observed during nginx shutdown. While here, restored correct order of ssl_certificate and ssl_certificate_key.
author Maxim Dounin <mdounin@mdounin.ru>
date Tue, 22 May 2018 17:46:59 +0300
parents ecbd984ffe04
children 0f2dd1f239ba
files ssl_engine_keys.t
diffstat 1 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/ssl_engine_keys.t
+++ b/ssl_engine_keys.t
@@ -47,8 +47,8 @@ http {
         listen       127.0.0.1:8080;
         server_name  localhost;
 
+        ssl_certificate localhost.crt;
         ssl_certificate_key engine:pkcs11:slot_0-id_00;
-        ssl_certificate localhost.crt;
 
         location / {
             # index index.html by default
@@ -81,9 +81,9 @@ pkcs11 = pkcs11_section
 
 [pkcs11_section]
 engine_id = pkcs11
-dynamic_path = /usr/local/lib/engines/engine_pkcs11.so
+dynamic_path = /usr/local/lib/engines/pkcs11.so
 MODULE_PATH = /usr/local/lib/softhsm/libsofthsm.so
-init = 0
+init = 1
 PIN = 1234
 
 [ req ]