]> granicus.if.org Git - apache/commit
mod_ssl: Add support for loading TLS certificates through the PKCS#11
authorJoe Orton <jorton@apache.org>
Tue, 8 May 2018 12:39:22 +0000 (12:39 +0000)
committerJoe Orton <jorton@apache.org>
Tue, 8 May 2018 12:39:22 +0000 (12:39 +0000)
commitbba7b9805a95ee505178e13eac1f7c82697f741d
tree72b1635b4bee10f6003a81b41272a4bbc65e65ac
parent6e0a97c995cd78e7f9b36cdf63fac4a84b803669
mod_ssl: Add support for loading TLS certificates through the PKCS#11
engine.

* modules/ssl/ssl_util.c (modssl_is_engine_id): Renamed
  from modssl_is_engine_key.

* modules/ssl/ssl_engine_config.c (ssl_cmd_SSLCertificateKeyFile):
  Adjust accordingly.
  (ssl_cmd_SSLCertificateFile): Also allow ENGINE cert ids.

* modules/ssl/ssl_engine_pphrase.c (modssl_load_engine_keypair):
  Rename from modssl_load_engine_key; load certificate if
  cert id is passed.

* modules/ssl/ssl_engine_init.c (ssl_init_server_certs): Optionally
  load the certificate from the engine as well.

* docs/manual/: Update manual.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1831168 13f79535-47bb-0310-9956-ffa450edef68
CHANGES
docs/log-message-tags/next-number
docs/manual/mod/mod_ssl.xml
modules/ssl/ssl_engine_config.c
modules/ssl/ssl_engine_init.c
modules/ssl/ssl_engine_pphrase.c
modules/ssl/ssl_private.h
modules/ssl/ssl_util.c