diff options
| author | 2004-12-02 09:43:34 +0000 | |
|---|---|---|
| committer | 2004-12-02 09:43:34 +0000 | |
| commit | b1f7f11579affffbcb2d7a44d3c38d73e8dc9bf4 (patch) | |
| tree | 173c96bf1b4f8dbaa98648016c218f41e393cb13 /src/mod_gnutls.c | |
| parent | dae0aec144d8929d6460941656175bdb2eecd235 (diff) | |
hey hey, this is working code!
Diffstat (limited to 'src/mod_gnutls.c')
| -rw-r--r-- | src/mod_gnutls.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/mod_gnutls.c b/src/mod_gnutls.c index d4f1f16..9cccb03 100644 --- a/src/mod_gnutls.c +++ b/src/mod_gnutls.c | |||
| @@ -149,7 +149,7 @@ static mod_gnutls_handle_t* create_gnutls_handle(apr_pool_t* pool, conn_rec * c) | |||
| 149 | 149 | ||
| 150 | gnutls_certificate_server_set_request(ctxt->session, GNUTLS_CERT_IGNORE); | 150 | gnutls_certificate_server_set_request(ctxt->session, GNUTLS_CERT_IGNORE); |
| 151 | 151 | ||
| 152 | // gnutls_dh_set_prime_bits(ctxt->session, DH_BITS); | 152 | gnutls_dh_set_prime_bits(ctxt->session, DH_BITS); |
| 153 | 153 | ||
| 154 | return ctxt; | 154 | return ctxt; |
| 155 | } | 155 | } |
| @@ -188,7 +188,7 @@ static const char *gnutls_set_cert_file(cmd_parms * parms, void *dummy, | |||
| 188 | (mod_gnutls_srvconf_rec *) ap_get_module_config(parms->server-> | 188 | (mod_gnutls_srvconf_rec *) ap_get_module_config(parms->server-> |
| 189 | module_config, | 189 | module_config, |
| 190 | &gnutls_module); | 190 | &gnutls_module); |
| 191 | sc->cert_file = apr_pstrdup(parms->pool, arg); | 191 | sc->cert_file = ap_server_root_relative(parms->pool, arg); |
| 192 | return NULL; | 192 | return NULL; |
| 193 | } | 193 | } |
| 194 | 194 | ||
| @@ -199,7 +199,7 @@ static const char *gnutls_set_key_file(cmd_parms * parms, void *dummy, | |||
| 199 | (mod_gnutls_srvconf_rec *) ap_get_module_config(parms->server-> | 199 | (mod_gnutls_srvconf_rec *) ap_get_module_config(parms->server-> |
| 200 | module_config, | 200 | module_config, |
| 201 | &gnutls_module); | 201 | &gnutls_module); |
| 202 | sc->key_file = apr_pstrdup(parms->pool, arg); | 202 | sc->key_file = ap_server_root_relative(parms->pool, arg); |
| 203 | return NULL; | 203 | return NULL; |
| 204 | } | 204 | } |
| 205 | 205 | ||
| @@ -291,9 +291,10 @@ static void *gnutls_config_server_create(apr_pool_t * p, server_rec * s) | |||
| 291 | sc->ciphers[i] = 0; | 291 | sc->ciphers[i] = 0; |
| 292 | 292 | ||
| 293 | i = 0; | 293 | i = 0; |
| 294 | sc->key_exchange[i++] = GNUTLS_KX_DHE_DSS; | ||
| 294 | sc->key_exchange[i++] = GNUTLS_KX_RSA; | 295 | sc->key_exchange[i++] = GNUTLS_KX_RSA; |
| 295 | sc->key_exchange[i++] = GNUTLS_KX_RSA_EXPORT; | ||
| 296 | sc->key_exchange[i++] = GNUTLS_KX_DHE_RSA; | 296 | sc->key_exchange[i++] = GNUTLS_KX_DHE_RSA; |
| 297 | sc->key_exchange[i++] = GNUTLS_KX_RSA_EXPORT; | ||
| 297 | sc->key_exchange[i++] = GNUTLS_KX_DHE_DSS; | 298 | sc->key_exchange[i++] = GNUTLS_KX_DHE_DSS; |
| 298 | sc->key_exchange[i] = 0; | 299 | sc->key_exchange[i] = 0; |
| 299 | 300 | ||
