Changeset cf2b905 in mod_gnutls for src/gnutls_config.c
- Timestamp:
- Nov 16, 2013, 2:46:50 AM (7 years ago)
- Branches:
- asyncio, debian/master, debian/stretch-backports, jessie-backports, master, proxy-ticket, upstream
- Children:
- e3cbda4
- Parents:
- fa45dcb
- git-author:
- Daniel Kahn Gillmor <dkg@…> (01/30/13 01:40:35)
- git-committer:
- Daniel Kahn Gillmor <dkg@…> (11/16/13 02:46:50)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
src/gnutls_config.c
rfa45dcb rcf2b905 363 363 } 364 364 365 const char *mgs_set_client_verify_method(cmd_parms * parms, void *dummy, 366 const char *arg) { 367 mgs_srvconf_rec *sc = (mgs_srvconf_rec *)ap_get_module_config(parms->server->module_config, &gnutls_module); 368 369 if (strcasecmp("cartel", arg) == 0) { 370 sc->client_verify_method = mgs_cvm_cartel; 371 } else if (strcasecmp("msva", arg) == 0) { 372 #ifdef ENABLE_MSVA 373 sc->client_verify_method = mgs_cvm_msva; 374 #else 375 return "GnuTLSClientVerifyMethod: msva is not supported"; 376 #endif 377 } else { 378 return "GnuTLSClientVerifyMethod: Invalid argument"; 379 } 380 381 return NULL; 382 } 383 365 384 const char *mgs_set_client_verify(cmd_parms * parms, void *dummy, 366 385 const char *arg) { … … 616 635 sc->proxy_enabled = GNUTLS_ENABLED_UNSET; 617 636 sc->export_certificates_enabled = GNUTLS_ENABLED_UNSET; 637 sc->client_verify_method = mgs_cvm_unset; 618 638 619 639 /* this relies on GnuTLS never changing the gnutls_certificate_request_t enum to define -1 */ … … 644 664 gnutls_srvconf_merge(proxy_enabled, GNUTLS_ENABLED_UNSET); 645 665 gnutls_srvconf_merge(export_certificates_enabled, GNUTLS_ENABLED_UNSET); 666 gnutls_srvconf_merge(client_verify_method, mgs_cvm_unset); 646 667 gnutls_srvconf_merge(client_verify_mode, -1); 647 668 gnutls_srvconf_merge(srp_tpasswd_file, NULL);
Note: See TracChangeset
for help on using the changeset viewer.