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

Comparing ircd-hybrid/trunk/src/conf_parser.y (file contents):
Revision 4121 by michael, Tue Jul 1 17:01:33 2014 UTC vs.
Revision 4162 by michael, Thu Jul 3 19:39:31 2014 UTC

# Line 340 | Line 340 | reset_block_state(void)
340   %token  T_SPY
341   %token  T_SSL
342   %token  T_SSL_CIPHER_LIST
343 – %token  T_SSL_CLIENT_METHOD
344 – %token  T_SSL_SERVER_METHOD
345 – %token  T_SSLV3
346 – %token  T_TLSV1
343   %token  T_UMODES
344   %token  T_UNAUTH
345   %token  T_UNDLINE
# Line 469 | Line 465 | serverinfo_item:        serverinfo_name
465                          serverinfo_vhost6 |
466                          serverinfo_sid |
467                          serverinfo_ssl_certificate_file |
472 –                        serverinfo_ssl_client_method |
473 –                        serverinfo_ssl_server_method |
468                          serverinfo_ssl_cipher_list |
469                          serverinfo_ssl_message_digest_algorithm |
470                          error ';' ;
471  
472  
479 – serverinfo_ssl_client_method: T_SSL_CLIENT_METHOD '=' client_method_types ';' ;
480 – serverinfo_ssl_server_method: T_SSL_SERVER_METHOD '=' server_method_types ';' ;
481 –
482 – client_method_types: client_method_types ',' client_method_type_item | client_method_type_item;
483 – client_method_type_item: T_SSLV3
484 – {
485 – #ifdef HAVE_LIBCRYPTO
486 –  if (conf_parser_ctx.pass == 2 && ServerInfo.client_ctx)
487 –    SSL_CTX_clear_options(ServerInfo.client_ctx, SSL_OP_NO_SSLv3);
488 – #endif
489 – } | T_TLSV1
490 – {
491 – #ifdef HAVE_LIBCRYPTO
492 –  if (conf_parser_ctx.pass == 2 && ServerInfo.client_ctx)
493 –    SSL_CTX_clear_options(ServerInfo.client_ctx, SSL_OP_NO_TLSv1);
494 – #endif
495 – };
496 –
497 – server_method_types: server_method_types ',' server_method_type_item | server_method_type_item;
498 – server_method_type_item: T_SSLV3
499 – {
500 – #ifdef HAVE_LIBCRYPTO
501 –  if (conf_parser_ctx.pass == 2 && ServerInfo.server_ctx)
502 –    SSL_CTX_clear_options(ServerInfo.server_ctx, SSL_OP_NO_SSLv3);
503 – #endif
504 – } | T_TLSV1
505 – {
506 – #ifdef HAVE_LIBCRYPTO
507 –  if (conf_parser_ctx.pass == 2 && ServerInfo.server_ctx)
508 –    SSL_CTX_clear_options(ServerInfo.server_ctx, SSL_OP_NO_TLSv1);
509 – #endif
510 – };
511 –
473   serverinfo_ssl_certificate_file: SSL_CERTIFICATE_FILE '=' QSTRING ';'
474   {
475   #ifdef HAVE_LIBCRYPTO

Diff Legend

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