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.
diff --git a/ssl_engine_keys.t b/ssl_engine_keys.t index 32b58cb..9bc689f 100644 --- a/ssl_engine_keys.t +++ b/ssl_engine_keys.t
@@ -47,8 +47,8 @@ listen 127.0.0.1:8080; server_name localhost; - ssl_certificate_key engine:pkcs11:slot_0-id_00; ssl_certificate localhost.crt; + ssl_certificate_key engine:pkcs11:slot_0-id_00; location / { # index index.html by default @@ -81,9 +81,9 @@ [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 ]