Changeset 87f1ed2 in mod_gnutls for include/mod_gnutls.h.in

Timestamp:

May 8, 2015, 8:40:02 PM (5 years ago)

Author:

Thomas Klute <thomas2.klute@…>

Branches:

debian/master, debian/stretch-backports, jessie-backports, master, upstream

Children:

8f90bf4

Parents:

39bd695

git-author:

Thomas Klute <thomas2.klute@…> (04/26/15 14:48:27)

git-committer:

Thomas Klute <thomas2.klute@…> (05/08/15 20:40:02)

Message:

Allow loading of an additional PKCS #11 provider library

When using PKCS #11, it may not be desirable to add the PKCS #11 module
to be used by mod_gnutls to the system wide config, and we definitely
cannot demand it for tests.

To work around such problems, add the new configuration parameter
"GnuTLSP11Module", which may contain the path of a library to load. Note
that the value is only used if present in the base server configuration
(not a virtual host), and that the library is used in addition to
system defaults (if any).

File:

• include/mod_gnutls.h.in (modified) (2 diffs)

include/mod_gnutls.h.in

@@ -112 +112 @@
         /* A Plain HTTP request */
     int non_ssl_request;
+
+    /* Additional PKCS #11 provider module to load, only valid in the
+     * base config, ignored in virtual hosts */
+    char *p11_module;
 
     /* PIN used for PKCS #11 operations */
@@ -419 +423 @@
 const char *mgs_set_client_ca_file(cmd_parms * parms, void *dummy,
                                    const char *arg);
+
+const char *mgs_set_p11_module(cmd_parms * parms, void *dummy,
+                               const char *arg);
+
 const char *mgs_set_pin(cmd_parms * parms, void *dummy,
                                    const char *arg);