www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-08 15:02:10 +03:00
Code Activity

Hook up PKCS#11 PIN entry through configured passphrase entry method.

Browse Source 
* modules/ssl/ssl_engine_pphrase.c: Add wrappers for OpenSSL UI * API
  around passphrase entry.
  (modssl_load_engine_keypair): Take vhost ID and use above rather than
  default OpenSSL UI.

* modules/ssl/ssl_engine_init.c (ssl_init_server_certs): Pass vhost ID.

Submitted by: Anderson Sasaki<ansaski redhat.com>, jorton


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1835240 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Joe Orton
2018-07-06 12:01:29 +00:00
parent 1779ce853d
commit 45e3cf9511
3 changed files with 232 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
modules/ssl/ssl_engine_init.c
View File

@@ -1293,8 +1293,9 @@ static apr_status_t ssl_init_server_certs(server_rec *s,
cert = NULL;
if ((rv = modssl_load_engine_keypair(s, ptemp, engine_certfile,
keyfile, &cert, &pkey))) {
if ((rv = modssl_load_engine_keypair(s, ptemp, vhost_id,
engine_certfile, keyfile,
&cert, &pkey))) {
return rv;
}