View | Details | Raw Unified | Return to bug 57100
Collapse All | Expand All

(-)modules/ssl/ssl_engine_config.c (-2 / +2 lines)
Lines 110-116 Link Here
110
    mctx->ticket_key          = NULL;
110
    mctx->ticket_key          = NULL;
111
#endif
111
#endif
112
112
113
    mctx->protocol            = SSL_PROTOCOL_ALL;
113
    mctx->protocol            = SSL_PROTOCOL_UNSET;
114
114
115
    mctx->pphrase_dialog_type = SSL_PPTYPE_UNSET;
115
    mctx->pphrase_dialog_type = SSL_PPTYPE_UNSET;
116
    mctx->pphrase_dialog_path = NULL;
116
    mctx->pphrase_dialog_path = NULL;
Lines 254-260 Link Here
254
                                 modssl_ctx_t *add,
254
                                 modssl_ctx_t *add,
255
                                 modssl_ctx_t *mrg)
255
                                 modssl_ctx_t *mrg)
256
{
256
{
257
    cfgMerge(protocol, SSL_PROTOCOL_ALL);
257
    cfgMerge(protocol, SSL_PROTOCOL_UNSET);
258
258
259
    cfgMerge(pphrase_dialog_type, SSL_PPTYPE_UNSET);
259
    cfgMerge(pphrase_dialog_type, SSL_PPTYPE_UNSET);
260
    cfgMergeString(pphrase_dialog_path);
260
    cfgMergeString(pphrase_dialog_path);
(-)modules/ssl/ssl_engine_init.c (+9 lines)
Lines 209-218 Link Here
209
        if (sc->enabled == SSL_ENABLED_UNSET) {
209
        if (sc->enabled == SSL_ENABLED_UNSET) {
210
            sc->enabled = SSL_ENABLED_FALSE;
210
            sc->enabled = SSL_ENABLED_FALSE;
211
        }
211
        }
212
212
        if (sc->proxy_enabled == UNSET) {
213
        if (sc->proxy_enabled == UNSET) {
213
            sc->proxy_enabled = FALSE;
214
            sc->proxy_enabled = FALSE;
214
        }
215
        }
215
216
217
        if (sc->server && sc->server->protocol == SSL_PROTOCOL_UNSET) {
218
            sc->server->protocol = SSL_PROTOCOL_ALL;
219
        }
220
221
        if (sc->proxy && sc->proxy->protocol == SSL_PROTOCOL_UNSET) {
222
            sc->proxy->protocol = SSL_PROTOCOL_ALL;
223
        }
224
216
        if (sc->session_cache_timeout == UNSET) {
225
        if (sc->session_cache_timeout == UNSET) {
217
            sc->session_cache_timeout = SSL_SESSION_CACHE_TIMEOUT;
226
            sc->session_cache_timeout = SSL_SESSION_CACHE_TIMEOUT;
218
        }
227
        }
(-)modules/ssl/ssl_private.h (-6 / +7 lines)
Lines 286-298 Link Here
286
/**
286
/**
287
 * Define the SSL Protocol options
287
 * Define the SSL Protocol options
288
 */
288
 */
289
#define SSL_PROTOCOL_NONE  (0)
289
#define SSL_PROTOCOL_UNSET (0)
290
#define SSL_PROTOCOL_SSLV2 (1<<0)
290
#define SSL_PROTOCOL_NONE  (1<<0)
291
#define SSL_PROTOCOL_SSLV3 (1<<1)
291
#define SSL_PROTOCOL_SSLV2 (1<<1)
292
#define SSL_PROTOCOL_TLSV1 (1<<2)
292
#define SSL_PROTOCOL_SSLV3 (1<<2)
293
#define SSL_PROTOCOL_TLSV1 (1<<3)
293
#ifdef HAVE_TLSV1_X
294
#ifdef HAVE_TLSV1_X
294
#define SSL_PROTOCOL_TLSV1_1 (1<<3)
295
#define SSL_PROTOCOL_TLSV1_1 (1<<4)
295
#define SSL_PROTOCOL_TLSV1_2 (1<<4)
296
#define SSL_PROTOCOL_TLSV1_2 (1<<5)
296
#define SSL_PROTOCOL_ALL   (SSL_PROTOCOL_SSLV3|SSL_PROTOCOL_TLSV1| \
297
#define SSL_PROTOCOL_ALL   (SSL_PROTOCOL_SSLV3|SSL_PROTOCOL_TLSV1| \
297
                            SSL_PROTOCOL_TLSV1_1|SSL_PROTOCOL_TLSV1_2)
298
                            SSL_PROTOCOL_TLSV1_1|SSL_PROTOCOL_TLSV1_2)
298
#else
299
#else

Return to bug 57100