}
fd = -1;
for (p = si; p != NULL; p = p->ai_next) {
- struct sockaddr *sa;
- void *addr;
- char tmp[INET6_ADDRSTRLEN + 50];
-
- sa = (struct sockaddr *)p->ai_addr;
- if (sa->sa_family == AF_INET) {
- addr = &((struct sockaddr_in *)sa)->sin_addr;
- } else if (sa->sa_family == AF_INET6) {
- addr = &((struct sockaddr_in6 *)sa)->sin6_addr;
- } else {
- addr = NULL;
- }
- if (addr != NULL) {
- inet_ntop(p->ai_family, addr, tmp, sizeof tmp);
- } else {
- sprintf(tmp, "<unknown family: %d>",
- (int)sa->sa_family);
- }
if (verbose) {
+ struct sockaddr *sa;
+ void *addr;
+ char tmp[INET6_ADDRSTRLEN + 50];
+
+ sa = (struct sockaddr *)p->ai_addr;
+ if (sa->sa_family == AF_INET) {
+ addr = &((struct sockaddr_in *)sa)->sin_addr;
+ } else if (sa->sa_family == AF_INET6) {
+ addr = &((struct sockaddr_in6 *)sa)->sin6_addr;
+ } else {
+ addr = NULL;
+ }
+ if (addr != NULL) {
+ if (!inet_ntop(p->ai_family, addr,
+ tmp, sizeof tmp))
+ {
+ strcpy(tmp, "<invalid>");
+ }
+ } else {
+ sprintf(tmp, "<unknown family: %d>",
+ (int)sa->sa_family);
+ }
fprintf(stderr, "connecting to: %s\n", tmp);
}
fd = socket(p->ai_family, p->ai_socktype, p->ai_protocol);
fprintf(stderr,
"options:\n");
fprintf(stderr,
-" -q suppress verbose messages\n");
+" -q suppress verbose messages\n");
+ fprintf(stderr,
+" -trace activate extra debug messages (dump of all packets)\n");
fprintf(stderr,
-" -trace activate extra debug messages (dump of all packets)\n");
+" -sni name use this specific name for SNI\n");
fprintf(stderr,
-" -sni name use this specific name for SNI\n");
+" -nosni do not send any SNI\n");
fprintf(stderr,
-" -nosni do not send any SNI\n");
+" -mono use monodirectional buffering\n");
fprintf(stderr,
-" -mono use monodirectional buffering\n");
+" -buf length set the I/O buffer length (in bytes)\n");
fprintf(stderr,
-" -buf length set the I/O buffer length (in bytes)\n");
+" -CA file add certificates in 'file' to trust anchors\n");
fprintf(stderr,
-" -CA file add certificates in 'file' to trust anchors\n");
+" -list list supported names (protocols, algorithms...)\n");
fprintf(stderr,
-" -list list supported names (protocols, algorithms...)\n");
+" -vmin name set minimum supported version (default: TLS-1.0)\n");
fprintf(stderr,
-" -vmin name set minimum supported version (default: TLS-1.0)\n");
+" -vmax name set maximum supported version (default: TLS-1.2)\n");
fprintf(stderr,
-" -vmax name set maximum supported version (default: TLS-1.2)\n");
+" -cs names set list of supported cipher suites (comma-separated)\n");
fprintf(stderr,
-" -cs names set list of supported cipher suites (comma-separated)\n");
+" -hf names add support for some hash functions (comma-separated)\n");
fprintf(stderr,
-" -hf names add support for some hash functions (comma-separated)\n");
+" -minhello len set minimum ClientHello length (in bytes)\n");
}
/* see brssl.h */
const br_hash_class *dnhash;
unsigned char *iobuf;
size_t iobuf_len;
+ size_t minhello_len;
int fd;
retcode = 0;
suite_ids = NULL;
iobuf = NULL;
iobuf_len = 0;
+ minhello_len = (size_t)-1;
fd = -1;
for (i = 0; i < argc; i ++) {
const char *arg;
usage_client();
goto client_exit_error;
}
- iobuf_len = strtoul(arg, 0, 10);
+ iobuf_len = parse_size(arg);
+ if (iobuf_len == (size_t)-1) {
+ usage_client();
+ goto client_exit_error;
+ }
} else if (eqstr(arg, "-CA")) {
if (++ i >= argc) {
fprintf(stderr,
goto client_exit_error;
}
hfuns |= x;
+ } else if (eqstr(arg, "-minhello")) {
+ if (++ i >= argc) {
+ fprintf(stderr,
+ "ERROR: no argument for '-minhello'\n");
+ usage_client();
+ goto client_exit_error;
+ }
+ arg = argv[i];
+ if (minhello_len != (size_t)-1) {
+ fprintf(stderr, "ERROR: duplicate minium"
+ " ClientHello length\n");
+ usage_client();
+ goto client_exit_error;
+ }
+ minhello_len = parse_size(arg);
+ /*
+ * Minimum ClientHello length must fit on 16 bits.
+ */
+ if (minhello_len == (size_t)-1
+ || (((minhello_len >> 12) >> 4) != 0))
+ {
+ usage_client();
+ goto client_exit_error;
+ }
} else {
fprintf(stderr, "ERROR: unknown option: '%s'\n", arg);
usage_client();
br_ssl_engine_set_x509(&cc.eng, &xc.vtable);
}
+ if (minhello_len != (size_t)-1) {
+ br_ssl_client_set_min_clienthello_len(&cc, minhello_len);
+ }
+
br_ssl_engine_set_buffer(&cc.eng, iobuf, iobuf_len, bidi);
br_ssl_client_reset(&cc, sni, 0);