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-8/src/ircd_parser.y (file contents):
Revision 1302 by michael, Wed Mar 21 17:48:54 2012 UTC vs.
Revision 1303 by michael, Fri Mar 23 10:52:19 2012 UTC

# Line 483 | Line 483 | serverinfo_ssl_connection_method: T_SSL_
483    if (conf_parser_ctx.boot && conf_parser_ctx.pass == 2)
484    {
485      if (!(ServerInfo.tls_version & CONF_SERVER_INFO_TLS_VERSION_SSLV3))
486 +    {
487        SSL_CTX_set_options(ServerInfo.server_ctx, SSL_OP_NO_SSLv3);
488 +      SSL_CTX_set_options(ServerInfo.client_ctx, SSL_OP_NO_SSLv3);
489 +    }
490 +
491      if (!(ServerInfo.tls_version & CONF_SERVER_INFO_TLS_VERSION_TLSV1))
492 +    {
493        SSL_CTX_set_options(ServerInfo.server_ctx, SSL_OP_NO_TLSv1);
494 +      SSL_CTX_set_options(ServerInfo.client_ctx, SSL_OP_NO_TLSv1);
495 +    }
496    }
497   #endif
498   };
# Line 517 | Line 524 | serverinfo_ssl_certificate_file: SSL_CER
524      }
525  
526      if (SSL_CTX_use_certificate_file(ServerInfo.server_ctx, yylval.string,
527 +                                     SSL_FILETYPE_PEM) <= 0 ||
528 +        SSL_CTX_use_certificate_file(ServerInfo.client_ctx, yylval.string,
529                                       SSL_FILETYPE_PEM) <= 0)
530      {
531        yyerror(ERR_lib_error_string(ERR_get_error()));
# Line 524 | Line 533 | serverinfo_ssl_certificate_file: SSL_CER
533      }
534  
535      if (SSL_CTX_use_PrivateKey_file(ServerInfo.server_ctx, ServerInfo.rsa_private_key_file,
536 +                                    SSL_FILETYPE_PEM) <= 0 ||
537 +        SSL_CTX_use_PrivateKey_file(ServerInfo.client_ctx, ServerInfo.rsa_private_key_file,
538                                      SSL_FILETYPE_PEM) <= 0)
539      {
540        yyerror(ERR_lib_error_string(ERR_get_error()));
541        break;
542      }
543  
544 <    if (!SSL_CTX_check_private_key(ServerInfo.server_ctx))
544 >    if (!SSL_CTX_check_private_key(ServerInfo.server_ctx) ||
545 >        !SSL_CTX_check_private_key(ServerInfo.client_ctx))
546      {
547        yyerror(ERR_lib_error_string(ERR_get_error()));
548        break;
# Line 2266 | Line 2278 | connect_flags_item: AUTOCONN
2278   {
2279    if (conf_parser_ctx.pass == 2)
2280      SetConfTopicBurst(yy_aconf);
2281 + } | T_SSL
2282 + {
2283 +  if (conf_parser_ctx.pass == 2)
2284 +    SetConfSSL(yy_aconf);
2285   };
2286  
2287   connect_encrypted: ENCRYPTED '=' TBOOL ';'

Diff Legend

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