ViewVC Help

View File | Revision Log | Show Annotations | View Changeset | Root Listing

root/svn/ircd-hybrid/trunk/src/conf_parser.y

Comparing ircd-hybrid-7.2/src/ircd_parser.y (file contents):
Revision 1023 by michael, Fri Sep 18 10:14:09 2009 UTC vs.
Revision 1024 by michael, Sun Nov 1 23:14:25 2009 UTC

#	Line 499 | Line 499 | serverinfo_item:        serverinfo_name
499
500		serverinfo_ssl_connection_method: T_SSL_CONNECTION_METHOD
501		{
502	+	#ifdef HAVE_LIBCRYPTO
503		if (conf_parser_ctx.boot && conf_parser_ctx.pass == 2)
504		ServerInfo.tls_version = 0;
505	+	#endif
506		} '=' method_types ';'
507		{
508	+	#ifdef HAVE_LIBCRYPTO
509		if (conf_parser_ctx.boot && conf_parser_ctx.pass == 2)
510		{
511		if (!(ServerInfo.tls_version & CONF_SERVER_INFO_TLS_VERSION_SSLV3))
#	Line 510 | Line 513 | serverinfo_ssl_connection_method: T_SSL_
513		if (!(ServerInfo.tls_version & CONF_SERVER_INFO_TLS_VERSION_TLSV1))
514		SSL_CTX_set_options(ServerInfo.server_ctx, SSL_OP_NO_TLSv1);
515		}
516	+	#endif
517		};
518
519		method_types: method_types ',' method_type_item | method_type_item;
520		method_type_item: T_SSLV3
521		{
522	+	#ifdef HAVE_LIBCRYPTO
523		if (conf_parser_ctx.boot && conf_parser_ctx.pass == 2)
524		ServerInfo.tls_version |= CONF_SERVER_INFO_TLS_VERSION_SSLV3;
525	+	#endif
526		} | T_TLSV1
527		{
528	+	#ifdef HAVE_LIBCRYPTO
529		if (conf_parser_ctx.boot && conf_parser_ctx.pass == 2)
530		ServerInfo.tls_version |= CONF_SERVER_INFO_TLS_VERSION_TLSV1;
531	+	#endif
532		};
533
534		serverinfo_ssl_certificate_file: SSL_CERTIFICATE_FILE '=' QSTRING ';'

Diff Legend

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