ViewVC Help

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

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

Comparing ircd-hybrid/trunk/src/conf_parser.y (file contents):
Revision 4094 by michael, Sun Jun 29 11:48:50 2014 UTC vs.
Revision 4114 by michael, Tue Jul 1 16:47:15 2014 UTC

#	Line 297 | Line 297 | reset_block_state(void)
297		%token  SSL_CONNECTION_REQUIRED
298		%token  SSL_DH_ELLIPTIC_CURVE
299		%token  SSL_DH_PARAM_FILE
300	+	%token  SSL_MESSAGE_DIGEST_ALGORITHM
301		%token  STATS_E_DISABLED
302		%token  STATS_I_OPER_ONLY
303		%token  STATS_K_OPER_ONLY
#	Line 471 | Line 472 | serverinfo_item:        serverinfo_name
472		serverinfo_ssl_client_method |
473		serverinfo_ssl_server_method |
474		serverinfo_ssl_cipher_list |
475	+	serverinfo_ssl_message_digest_algorithm |
476		error ';' ;
477
478
#	Line 643 | Line 645 | serverinfo_ssl_cipher_list: T_SSL_CIPHER
645		#endif
646		};
647
648	+	serverinfo_ssl_message_digest_algorithm: SSL_MESSAGE_DIGEST_ALGORITHM '=' QSTRING ';'
649	+	{
650	+	#ifdef HAVE_LIBCRYPTO
651	+	if (conf_parser_ctx.pass == 2 && ServerInfo.server_ctx)
652	+	{
653	+	if ((ServerInfo.message_digest_algorithm = EVP_get_digestbyname(yylval.string)) == NULL)
654	+	conf_error_report("Ignoring serverinfo::ssl_message_digest_algorithm -- unknown message digest algorithm");
655	+	else
656	+	ServerInfo.message_digest_algorithm = EVP_sha256();
657	+	}
658	+	#endif
659	+	}
660	+
661		serverinfo_ssl_dh_elliptic_curve: SSL_DH_ELLIPTIC_CURVE '=' QSTRING ';'
662		{
663		#ifdef HAVE_LIBCRYPTO

Diff Legend

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