ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/svn/ircd-hybrid/trunk/src/ircd.c
(Generate patch)

Comparing ircd-hybrid/trunk/src/ircd.c (file contents):
Revision 4620 by michael, Sun Sep 7 13:03:42 2014 UTC vs.
Revision 4730 by michael, Sat Oct 11 19:16:48 2014 UTC

# Line 417 | Line 417 | static void
417   ssl_init(void)
418   {
419   #ifdef HAVE_LIBCRYPTO
420 –  const unsigned char session_id[] = "ircd-hybrid";
421 –
420    SSL_load_error_strings();
421    SSLeay_add_ssl_algorithms();
422  
# Line 431 | Line 429 | ssl_init(void)
429      exit(EXIT_FAILURE);
430    }
431  
432 <  SSL_CTX_set_options(ConfigServerInfo.server_ctx, SSL_OP_NO_SSLv2|SSL_OP_NO_SSLv3);
432 >  SSL_CTX_set_options(ConfigServerInfo.server_ctx, SSL_OP_NO_SSLv2|SSL_OP_NO_SSLv3|SSL_OP_NO_TICKET);
433    SSL_CTX_set_options(ConfigServerInfo.server_ctx, SSL_OP_SINGLE_DH_USE|SSL_OP_CIPHER_SERVER_PREFERENCE);
434    SSL_CTX_set_verify(ConfigServerInfo.server_ctx, SSL_VERIFY_PEER|SSL_VERIFY_CLIENT_ONCE,
435                       always_accept_verify_cb);
436 <  SSL_CTX_set_session_id_context(ConfigServerInfo.server_ctx, session_id, sizeof(session_id) - 1);
436 >  SSL_CTX_set_session_cache_mode(ConfigServerInfo.server_ctx, SSL_SESS_CACHE_OFF);
437  
438   #if OPENSSL_VERSION_NUMBER >= 0x1000005FL && !defined(OPENSSL_NO_ECDH)
439    {
# Line 460 | Line 458 | ssl_init(void)
458      exit(EXIT_FAILURE);
459    }
460  
461 <  SSL_CTX_set_options(ConfigServerInfo.client_ctx, SSL_OP_NO_SSLv2|SSL_OP_NO_SSLv3);
461 >  SSL_CTX_set_options(ConfigServerInfo.client_ctx, SSL_OP_NO_SSLv2|SSL_OP_NO_SSLv3|SSL_OP_NO_TICKET);
462    SSL_CTX_set_options(ConfigServerInfo.client_ctx, SSL_OP_SINGLE_DH_USE);
463    SSL_CTX_set_verify(ConfigServerInfo.client_ctx, SSL_VERIFY_PEER|SSL_VERIFY_CLIENT_ONCE,
464                       always_accept_verify_cb);
465 +  SSL_CTX_set_session_cache_mode(ConfigServerInfo.client_ctx, SSL_SESS_CACHE_OFF);
466   #endif /* HAVE_LIBCRYPTO */
467   }
468  

Diff Legend

– Removed lines
+ Added lines
< Changed lines (old)
> Changed lines (new)