"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "src/cfg_parser.y" between
hitch-1.7.0.tar.gz and hitch-1.7.2.tar.gz

About: Hitch is a libev-based high performance SSL/TLS proxy that terminates TLS/SSL connections and forwards the unencrypted traffic to some backend.

cfg_parser.y  (hitch-1.7.0):cfg_parser.y  (hitch-1.7.2)
skipping to change at line 234 skipping to change at line 234
PEM_DIR_GLOB: TOK_PEM_DIR_GLOB '=' STRING { PEM_DIR_GLOB: TOK_PEM_DIR_GLOB '=' STRING {
if ($3) if ($3)
cfg->PEM_DIR_GLOB = strdup($3); cfg->PEM_DIR_GLOB = strdup($3);
else else
cfg->PEM_DIR_GLOB = NULL; cfg->PEM_DIR_GLOB = NULL;
}; };
OCSP_DIR: TOK_OCSP_DIR '=' STRING { OCSP_DIR: TOK_OCSP_DIR '=' STRING {
free(cfg->OCSP_DIR);
if ($3) if ($3)
cfg->OCSP_DIR = strdup($3); cfg->OCSP_DIR = strdup($3);
else else
cfg->OCSP_DIR = NULL; cfg->OCSP_DIR = NULL;
}; };
OCSP_RESP_TMO: TOK_OCSP_RESP_TMO '=' UINT { OCSP_RESP_TMO: TOK_OCSP_RESP_TMO '=' UINT {
cfg->OCSP_RESP_TMO = $3; cfg->OCSP_RESP_TMO = $3;
}; };
skipping to change at line 479 skipping to change at line 480
}; };
SYSLOG_REC: TOK_SYSLOG '=' BOOL { cfg->SYSLOG = $3; }; SYSLOG_REC: TOK_SYSLOG '=' BOOL { cfg->SYSLOG = $3; };
DAEMON_REC: TOK_DAEMON '=' BOOL { cfg->DAEMONIZE = $3; }; DAEMON_REC: TOK_DAEMON '=' BOOL { cfg->DAEMONIZE = $3; };
SNI_NOMATCH_ABORT_REC : TOK_SNI_NOMATCH_ABORT '=' BOOL { SNI_NOMATCH_ABORT_REC : TOK_SNI_NOMATCH_ABORT '=' BOOL {
cfg->SNI_NOMATCH_ABORT = $3; cfg->SNI_NOMATCH_ABORT = $3;
}; };
CIPHERS_REC: TOK_CIPHERS '=' STRING { CIPHERS_REC: TOK_CIPHERS '=' STRING {
if ($3) { if ($3) {
free(cfg->CIPHERS_TLSv12);
cfg->CIPHERS_TLSv12 = strdup($3); cfg->CIPHERS_TLSv12 = strdup($3);
} }
}; };
CIPHERSUITES_REC: TOK_CIPHERSUITES '=' STRING { CIPHERSUITES_REC: TOK_CIPHERSUITES '=' STRING {
if ($3) { if ($3) {
free(cfg->CIPHERSUITES_TLSv13);
cfg->CIPHERSUITES_TLSv13 = strdup($3); cfg->CIPHERSUITES_TLSv13 = strdup($3);
} }
}; };
USER_REC: TOK_USER '=' STRING { USER_REC: TOK_USER '=' STRING {
/* XXX: passing an empty string for file */ /* XXX: passing an empty string for file */
if ($3 && config_param_validate("user", $3, cfg, "", if ($3 && config_param_validate("user", $3, cfg, "",
yyget_lineno()) != 0) yyget_lineno()) != 0)
YYABORT; YYABORT;
}; };
skipping to change at line 617 skipping to change at line 620
YYABORT; YYABORT;
#endif #endif
}; };
BACKEND_REFRESH_REC: TOK_BACKEND_REFRESH '=' UINT { BACKEND_REFRESH_REC: TOK_BACKEND_REFRESH '=' UINT {
cfg->BACKEND_REFRESH_TIME = $3; cfg->BACKEND_REFRESH_TIME = $3;
}; };
ECDH_CURVE_REC: TOK_ECDH_CURVE '=' STRING { ECDH_CURVE_REC: TOK_ECDH_CURVE '=' STRING {
if ($3) { if ($3) {
free(cfg->ECDH_CURVE);
cfg->ECDH_CURVE = strdup($3); cfg->ECDH_CURVE = strdup($3);
} }
}; };
CLIENT_VERIFY_REC: TOK_CLIENT_VERIFY '=' CLIENT_VERIFY_OPT; CLIENT_VERIFY_REC: TOK_CLIENT_VERIFY '=' CLIENT_VERIFY_OPT;
CLIENT_VERIFY_OPT CLIENT_VERIFY_OPT
: TOK_VERIFY_NONE { : TOK_VERIFY_NONE {
if (cur_fa) if (cur_fa)
cur_fa->client_verify = SSL_VERIFY_NONE; cur_fa->client_verify = SSL_VERIFY_NONE;
skipping to change at line 646 skipping to change at line 650
| TOK_VERIFY_REQ { | TOK_VERIFY_REQ {
if (cur_fa) if (cur_fa)
cur_fa->client_verify = cur_fa->client_verify =
SSL_VERIFY_PEER | SSL_VERIFY_FAIL_IF_NO_PEER_CERT; SSL_VERIFY_PEER | SSL_VERIFY_FAIL_IF_NO_PEER_CERT;
else else
cfg->CLIENT_VERIFY = cfg->CLIENT_VERIFY =
SSL_VERIFY_PEER | SSL_VERIFY_FAIL_IF_NO_PEER_CERT; SSL_VERIFY_PEER | SSL_VERIFY_FAIL_IF_NO_PEER_CERT;
}; };
CLIENT_VERIFY_CA_REC: TOK_CLIENT_VERIFY_CA '=' STRING { CLIENT_VERIFY_CA_REC: TOK_CLIENT_VERIFY_CA '=' STRING {
free(cfg->CLIENT_VERIFY_CA);
cfg->CLIENT_VERIFY_CA = strdup($3); cfg->CLIENT_VERIFY_CA = strdup($3);
}; };
%% %%
void void
yyerror(hitch_config *cfg, const char *s) yyerror(hitch_config *cfg, const char *s)
{ {
(void) cfg; (void) cfg;
 End of changes. 5 change blocks. 
0 lines changed or deleted 5 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)