Changes in include/mod_gnutls.h.in [d04f7da:f030883] in mod_gnutls


Ignore:
File:
1 edited

Legend:

Unmodified
Added
Removed
  • include/mod_gnutls.h.in

    rd04f7da rf030883  
    3434#include <gnutls/extra.h>
    3535#endif
    36 #include <gnutls/abstract.h>
    3736#include <gnutls/openpgp.h>
    3837#include <gnutls/x509.h>
     
    105104/* Server Configuration Record */
    106105typedef struct {
    107     /* --- Configuration values --- */
    108         /* Is the module enabled? */
    109     int enabled;
    110         /* Is mod_proxy enabled? */
    111     int proxy_enabled;
    112         /* A Plain HTTP request */
    113     int non_ssl_request;
    114 
    115     /* PIN used for PKCS #11 operations */
    116     char *pin;
    117 
    118     /* the SRK PIN used in TPM operations */
    119     char *srk_pin;
    120 
    121     char *x509_cert_file;
    122     char *x509_key_file;
    123     char *x509_ca_file;
    124 
    125     char *pgp_cert_file;
    126     char *pgp_key_file;
    127     char *pgp_ring_file;
    128 
    129     char *dh_file;
    130 
    131     char *priorities_str;
    132 
    133     const char* srp_tpasswd_file;
    134     const char* srp_tpasswd_conf_file;
    135 
    136         /* Cache timeout value */
    137     int cache_timeout;
    138         /* Chose Cache Type */
    139     mgs_cache_e cache_type;
    140     const char* cache_config;
    141 
    142         /* GnuTLS uses Session Tickets */
    143     int tickets;
    144 
    145     /* --- Things initialized at _child_init --- */
    146 
    147         /* x509 Certificate Structure */
     106    /* x509 Certificate Structure */
    148107    gnutls_certificate_credentials_t certs;
    149         /* SRP Certificate Structure*/
     108    /* x509 credentials for proxy connections */
     109    gnutls_certificate_credentials_t proxy_x509_creds;
     110    /* trust list for proxy_x509_creds */
     111    gnutls_x509_trust_list_t proxy_x509_tl;
     112    const char* proxy_x509_key_file;
     113    const char* proxy_x509_cert_file;
     114    const char* proxy_x509_ca_file;
     115    const char* proxy_x509_crl_file;
     116    /* GnuTLS priorities for proxy connections */
     117    gnutls_priority_t proxy_priorities;
     118    /* SRP Certificate Structure*/
    150119    gnutls_srp_server_credentials_t srp_creds;
    151         /* Annonymous Certificate Structure */
     120    /* Anonymous Certificate Structure */
    152121    gnutls_anon_server_credentials_t anon_creds;
     122    /* Anonymous Client Certificate Structure, used for proxy
     123     * connections */
     124    gnutls_anon_client_credentials_t anon_client_creds;
    153125        /* Current x509 Certificate CN [Common Name] */
    154126    char* cert_cn;
    155127        /* Current x509 Certificate SAN [Subject Alternate Name]s*/
    156     char* cert_san[MAX_CERT_SAN];
    157         /* An x509 Certificate Chain */
    158     gnutls_pcert_st *certs_x509_chain;
    159     gnutls_x509_crt_t *certs_x509_crt_chain;
     128        char* cert_san[MAX_CERT_SAN];
     129        /* A x509 Certificate Chain */
     130    gnutls_x509_crt_t *certs_x509_chain;
     131        /* Current x509 Certificate Private Key */
     132    gnutls_x509_privkey_t privkey_x509;
     133        /* OpenPGP Certificate */
     134    gnutls_openpgp_crt_t cert_pgp;
     135        /* OpenPGP Certificate Private Key */
     136    gnutls_openpgp_privkey_t privkey_pgp;
    160137        /* Number of Certificates in Chain */
    161138    unsigned int certs_x509_chain_num;
    162 
    163         /* Current x509 Certificate Private Key */
    164     gnutls_privkey_t privkey_x509;
    165 
    166         /* OpenPGP Certificate */
    167     gnutls_pcert_st *cert_pgp;
    168     gnutls_openpgp_crt_t *cert_crt_pgp;
    169 
    170         /* OpenPGP Certificate Private Key */
    171     gnutls_privkey_t privkey_pgp;
    172 #if GNUTLS_VERSION_NUMBER < 0x030312
    173     /* Internal structure for the OpenPGP private key, used in the
    174      * workaround for a bug in gnutls_privkey_import_openpgp_raw that
    175      * frees memory that is still needed. DO NOT USE for any other
    176      * purpose. */
    177     gnutls_openpgp_privkey_t privkey_pgp_internal;
    178 #endif
    179 
     139        /* Is the module enabled? */
     140    int enabled;
    180141    /* Export full certificates to CGI environment: */
    181142    int export_certificates_size;
     
    184145        /* GnuTLS DH Parameters */
    185146    gnutls_dh_params_t dh_params;
     147        /* Cache timeout value */
     148    int cache_timeout;
     149        /* Chose Cache Type */
     150    mgs_cache_e cache_type;
     151    const char* cache_config;
     152    const char* srp_tpasswd_file;
     153    const char* srp_tpasswd_conf_file;
    186154        /* A list of CA Certificates */
    187155    gnutls_x509_crt_t *ca_list;
     
    196164        /* Last Cache timestamp */
    197165    apr_time_t last_cache_check;
     166        /* GnuTLS uses Session Tickets */
     167    int tickets;
     168        /* Is mod_proxy enabled? */
     169    int proxy_enabled;
     170        /* A Plain HTTP request */
     171    int non_ssl_request;
    198172} mgs_srvconf_rec;
    199173
     
    212186        /* Is TLS enabled for this connection? */
    213187    int enabled;
     188    /* Is this a proxy connection? */
     189    int is_proxy;
    214190        /* GnuTLS Session handle */
    215191    gnutls_session_t session;
     
    343319
    344320/**
    345  * Perform any reinitialization required in PKCS #11
    346  */
    347 int mgs_pkcs11_reinit(server_rec * s);
    348 
    349 /**
    350321 * Convert a SSL Session ID into a Null Terminated Hex Encoded String
    351322 * @param id raw SSL Session ID
     
    367338
    368339/* Configuration Functions */
    369 
    370 /* Loads all files set in the configuration */
    371 int mgs_load_files(apr_pool_t * p, server_rec * s);
    372340
    373341const char *mgs_set_srp_tpasswd_conf_file(cmd_parms * parms, void *dummy,
     
    403371const char *mgs_set_client_ca_file(cmd_parms * parms, void *dummy,
    404372                                   const char *arg);
    405 const char *mgs_set_pin(cmd_parms * parms, void *dummy,
    406                                    const char *arg);
    407 
    408 const char *mgs_set_srk_pin(cmd_parms * parms, void *dummy,
    409                                    const char *arg);
    410373
    411374const char *mgs_set_keyring_file(cmd_parms * parms, void *dummy,
     
    435398mgs_srvconf_rec* mgs_find_sni_server(gnutls_session_t session);
    436399
     400const char *mgs_store_cred_path(cmd_parms * parms,
     401                                void *dummy __attribute__((unused)),
     402                                const char *arg);
     403
    437404/* mod_gnutls Hooks. */
    438405
Note: See TracChangeset for help on using the changeset viewer.