- Timestamp:
- May 8, 2015, 8:40:02 PM (7 years ago)
- Branches:
- asyncio, debian/master, debian/stretch-backports, jessie-backports, master, proxy-ticket, 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)
- Location:
- src
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
src/gnutls_config.c
r39bd695 r87f1ed2 948 948 sc->privkey_pgp = NULL; 949 949 sc->certs_x509_chain_num = 0; 950 sc->p11_module = NULL; 950 951 sc->pin = NULL; 951 952 sc->priorities_str = NULL; … … 1008 1009 gnutls_srvconf_merge(x509_key_file, NULL); 1009 1010 gnutls_srvconf_merge(x509_ca_file, NULL); 1011 gnutls_srvconf_merge(p11_module, NULL); 1010 1012 gnutls_srvconf_merge(pin, NULL); 1011 1013 gnutls_srvconf_merge(pgp_cert_file, NULL); … … 1100 1102 return NULL; 1101 1103 } 1104 1105 1106 1107 /* 1108 * Record additional PKCS #11 module to load. Note that the value is 1109 * only used in the base config, settings in virtual hosts are 1110 * ignored. 1111 */ 1112 const char *mgs_set_p11_module(cmd_parms * parms, 1113 void *dummy __attribute__((unused)), 1114 const char *arg) 1115 { 1116 mgs_srvconf_rec *sc = (mgs_srvconf_rec *) 1117 ap_get_module_config(parms->server->module_config, &gnutls_module); 1118 sc->p11_module = apr_pstrdup(parms->pool, arg); 1119 return NULL; 1120 } -
src/gnutls_hooks.c
r39bd695 r87f1ed2 320 320 " Shutting Down."); 321 321 exit(-1); 322 } 323 324 /* Load additional PKCS #11 module, if requested */ 325 if (sc_base->p11_module != NULL) 326 { 327 rv = gnutls_pkcs11_add_provider(sc_base->p11_module, NULL); 328 if (rv != GNUTLS_E_SUCCESS) 329 ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, s, 330 "GnuTLS: Loading PKCS #11 provider module %s " 331 "failed: %s (%d).", 332 sc_base->p11_module, gnutls_strerror(rv), rv); 322 333 } 323 334 -
src/mod_gnutls.c
r39bd695 r87f1ed2 140 140 RSRC_CONF | OR_AUTHCFG, 141 141 "Enable SSL Proxy Engine"), 142 AP_INIT_TAKE1("GnuTLSP11Module", mgs_set_p11_module, 143 NULL, 144 RSRC_CONF, 145 "Load this additional PKCS #11 provider library"), 142 146 AP_INIT_RAW_ARGS("GnuTLSPIN", mgs_set_pin, 143 147 NULL,
Note: See TracChangeset
for help on using the changeset viewer.