j3d1/bearssl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Added flag to prohibit renegotiations.

Browse source
This commit is contained in:
Thomas Pornin 2016-11-20 18:50:37 +01:00
parent 3b044d4296
commit d16eee962a
10 changed files with 626 additions and 583 deletions
Download patch file Download diff file Expand all files Collapse all files

7
tools/client.c
View file

@ -152,6 +152,8 @@ usage_client(void)
" -minhello len set minimum ClientHello length (in bytes)\n");
fprintf(stderr,
" -fallback send the TLS_FALLBACK_SCSV (i.e. claim a downgrade)\n");
fprintf(stderr,
" -noreneg prohibit renegotiations\n");
}
/* see brssl.h */
@ -181,6 +183,7 @@ do_client(int argc, char *argv[])
size_t iobuf_len;
size_t minhello_len;
int fallback;
uint32_t flags;
int fd;
retcode = 0;
@ -201,6 +204,7 @@ do_client(int argc, char *argv[])
iobuf_len = 0;
minhello_len = (size_t)-1;
fallback = 0;
flags = 0;
fd = -1;
for (i = 0; i < argc; i ++) {
const char *arg;
@ -383,6 +387,8 @@ do_client(int argc, char *argv[])
}
} else if (eqstr(arg, "-fallback")) {
fallback = 1;
} else if (eqstr(arg, "-noreneg")) {
flags |= BR_OPT_NO_RENEGOTIATION;
} else {
fprintf(stderr, "ERROR: unknown option: '%s'\n", arg);
usage_client();
@ -616,6 +622,7 @@ do_client(int argc, char *argv[])
if (minhello_len != (size_t)-1) {
br_ssl_client_set_min_clienthello_len(&cc, minhello_len);
}
br_ssl_engine_set_all_flags(&cc.eng, flags);
br_ssl_engine_set_buffer(&cc.eng, iobuf, iobuf_len, bidi);
br_ssl_client_reset(&cc, sni, 0);

4
tools/server.c
View file

@ -793,6 +793,8 @@ do_server(int argc, char *argv[])
hfuns |= x;
} else if (eqstr(arg, "-serverpref")) {
flags |= BR_OPT_ENFORCE_SERVER_PREFERENCES;
} else if (eqstr(arg, "-noreneg")) {
flags |= BR_OPT_NO_RENEGOTIATION;
} else {
fprintf(stderr, "ERROR: unknown option: '%s'\n", arg);
usage_server();
@ -902,7 +904,7 @@ do_server(int argc, char *argv[])
suite_ids = xmalloc(num_suites * sizeof *suite_ids);
br_ssl_server_zero(&cc);
br_ssl_engine_set_versions(&cc.eng, vmin, vmax);
br_ssl_server_set_all_flags(&cc, flags);
br_ssl_engine_set_all_flags(&cc.eng, flags);
if (vmin <= BR_TLS11) {
if (!(hfuns & (1 << br_md5_ID))) {
fprintf(stderr, "ERROR: TLS 1.0 and 1.1 need MD5\n");

7
tools/sslio.c
View file

@ -82,8 +82,11 @@ run_command(br_ssl_engine_context *cc, unsigned char *buf, size_t len)
br_ssl_engine_close(cc);
return 1;
case 'R':
fprintf(stderr, "renegotiating...\n");
br_ssl_engine_renegotiate(cc);
if (br_ssl_engine_renegotiate(cc)) {
fprintf(stderr, "renegotiating...\n");
} else {
fprintf(stderr, "not renegotiating.\n");
}
return 1;
case 'F':
/*