Changeset 2dd044f in mod_gnutls for src/mod_gnutls.c


Ignore:
Timestamp:
Jan 11, 2013, 12:56:51 AM (8 years ago)
Author:
Daniel Kahn Gillmor <dkg@…>
Branches:
debian/master, debian/stretch-backports, jessie-backports
Children:
54b3065
Parents:
15ffe0b (diff), 9d9b093 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge tag 'upstream/0.5.1'

Upstream version 0.5.1

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/mod_gnutls.c

    r15ffe0b r2dd044f  
    6464                  RSRC_CONF,
    6565                  "Set the CA File to verify Client Certificates"),
     66    AP_INIT_TAKE1("GnuTLSX509CAFile", mgs_set_client_ca_file,
     67                  NULL,
     68                  RSRC_CONF,
     69                  "Set the CA File to verify Client Certificates"),
     70    AP_INIT_TAKE1("GnuTLSPGPKeyringFile", mgs_set_keyring_file,
     71                  NULL,
     72                  RSRC_CONF,
     73                  "Set the Keyring File to verify Client Certificates"),
    6674    AP_INIT_TAKE1("GnuTLSDHFile", mgs_set_dh_file,
    6775                  NULL,
     
    7583                  NULL,
    7684                  RSRC_CONF,
    77                   "SSL Server Key file"),
     85                  "SSL Server X509 Certificate file"),
    7886    AP_INIT_TAKE1("GnuTLSKeyFile", mgs_set_key_file,
    7987                  NULL,
    8088                  RSRC_CONF,
    81                   "SSL Server SRP Password file"),
     89                  "SSL Server X509 Private Key file"),
     90    AP_INIT_TAKE1("GnuTLSX509CertificateFile", mgs_set_cert_file,
     91                  NULL,
     92                  RSRC_CONF,
     93                  "SSL Server X509 Certificate file"),
     94    AP_INIT_TAKE1("GnuTLSX509KeyFile", mgs_set_key_file,
     95                  NULL,
     96                  RSRC_CONF,
     97                  "SSL Server X509 Private Key file"),
     98    AP_INIT_TAKE1("GnuTLSPGPCertificateFile", mgs_set_pgpcert_file,
     99                  NULL,
     100                  RSRC_CONF,
     101                  "SSL Server PGP Certificate file"),
     102    AP_INIT_TAKE1("GnuTLSPGPKeyFile", mgs_set_pgpkey_file,
     103                  NULL,
     104                  RSRC_CONF,
     105                  "SSL Server PGP Private key file"),
    82106#ifdef ENABLE_SRP
    83107    AP_INIT_TAKE1("GnuTLSSRPPasswdFile", mgs_set_srp_tpasswd_file,
Note: See TracChangeset for help on using the changeset viewer.