#include <string.h>
#include <stdint.h>
#include <errno.h>
+#include <signal.h>
#include <sys/types.h>
#include <sys/socket.h>
#include <arpa/inet.h>
#include <unistd.h>
#include <fcntl.h>
-#include <sys/poll.h>
#include "brssl.h"
#include "bearssl.h"
struct sockaddr_in6 sa6;
size_t sa_len;
void *addr;
- char tmp[INET6_ADDRSTRLEN + 50];
int opt;
sa = (struct sockaddr *)p->ai_addr;
addr = NULL;
sa_len = p->ai_addrlen;
}
- if (addr != NULL) {
- inet_ntop(p->ai_family, addr, tmp, sizeof tmp);
- } else {
- sprintf(tmp, "<unknown family: %d>",
- (int)sa->sa_family);
- }
if (verbose) {
+ char tmp[INET6_ADDRSTRLEN + 50];
+
+ 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, "binding to: %s\n", tmp);
}
fd = socket(p->ai_family, p->ai_socktype, p->ai_protocol);
tmp, sizeof tmp);
break;
case AF_INET6:
- name = inet_ntop(AF_INET,
- &((struct sockaddr_in *)&sa)->sin_addr,
+ name = inet_ntop(AF_INET6,
+ &((struct sockaddr_in6 *)&sa)->sin6_addr,
tmp, sizeof tmp);
break;
}
fprintf(stderr,
" -key fname read private key from file 'fname'\n");
fprintf(stderr,
+" -CA file add trust anchors from 'file' (for client auth)\n");
+ fprintf(stderr,
+" -anon_ok request but do not require a client certificate\n");
+ fprintf(stderr,
" -list list supported names (protocols, algorithms...)\n");
fprintf(stderr,
" -vmin name set minimum supported version (default: TLS-1.0)\n");
private_key *sk;
} policy_context;
+static void
+print_hashes(unsigned chashes)
+{
+ int i;
+
+ for (i = 2; i <= 6; i ++) {
+ if ((chashes >> i) & 1) {
+ int z;
+
+ switch (i) {
+ case 3: z = 224; break;
+ case 4: z = 256; break;
+ case 5: z = 384; break;
+ case 6: z = 512; break;
+ default:
+ z = 1;
+ break;
+ }
+ fprintf(stderr, " sha%d", z);
+ }
+ }
+}
+
static int
-get_cert_signer_algo(br_x509_certificate *xc)
+choose_hash(unsigned chashes)
{
- br_x509_decoder_context dc;
- int err;
+ int hash_id;
- br_x509_decoder_init(&dc, 0, 0);
- br_x509_decoder_push(&dc, xc->data, xc->data_len);
- err = br_x509_decoder_last_error(&dc);
- if (err != 0) {
- return -err;
- } else {
- return br_x509_decoder_get_signer_key_type(&dc);
+ for (hash_id = 6; hash_id >= 2; hash_id --) {
+ if (((chashes >> hash_id) & 1) != 0) {
+ return hash_id;
+ }
}
+ /*
+ * Normally unreachable.
+ */
+ return 0;
}
static int
const br_suite_translated *st;
size_t u, st_num;
unsigned chashes;
- int hash_id;
pc = (policy_context *)pctx;
st = br_ssl_server_get_client_suites(cc, &st_num);
chashes = br_ssl_server_get_client_hashes(cc);
- for (hash_id = 6; hash_id >= 2; hash_id --) {
- if ((chashes >> hash_id) & 1) {
- break;
- }
- }
if (pc->verbose) {
fprintf(stderr, "Client parameters:\n");
fprintf(stderr, " Maximum version: ");
get_suite_name_ext(st[u][0], csn, sizeof csn);
fprintf(stderr, " %s\n", csn);
}
- fprintf(stderr, " Common hash functions:");
- for (u = 2; u <= 6; u ++) {
- if ((chashes >> u) & 1) {
- int z;
-
- switch (u) {
- case 3: z = 224; break;
- case 4: z = 256; break;
- case 5: z = 384; break;
- case 6: z = 512; break;
- default:
- z = 1;
- break;
- }
- fprintf(stderr, " sha%d", z);
- }
+ fprintf(stderr, " Common sign+hash functions:\n");
+ if ((chashes & 0xFF) != 0) {
+ fprintf(stderr, " with RSA:");
+ print_hashes(chashes);
+ fprintf(stderr, "\n");
+ }
+ if ((chashes >> 8) != 0) {
+ fprintf(stderr, " with ECDSA:");
+ print_hashes(chashes >> 8);
+ fprintf(stderr, "\n");
}
- fprintf(stderr, "\n");
}
for (u = 0; u < st_num; u ++) {
unsigned tt;
case BR_SSLKEYX_ECDHE_RSA:
if (pc->sk->key_type == BR_KEYTYPE_RSA) {
choices->cipher_suite = st[u][0];
- choices->hash_id = hash_id;
+ if (br_ssl_engine_get_version(&cc->eng)
+ < BR_TLS12)
+ {
+ choices->hash_id = 0;
+ } else {
+ choices->hash_id = choose_hash(chashes);
+ }
goto choose_ok;
}
break;
case BR_SSLKEYX_ECDHE_ECDSA:
if (pc->sk->key_type == BR_KEYTYPE_EC) {
choices->cipher_suite = st[u][0];
- choices->hash_id = hash_id;
+ if (br_ssl_engine_get_version(&cc->eng)
+ < BR_TLS12)
+ {
+ choices->hash_id = br_sha1_ID;
+ } else {
+ choices->hash_id =
+ choose_hash(chashes >> 8);
+ }
goto choose_ok;
}
break;
}
}
-/*
- * OID for hash functions in RSA signatures.
- */
-static const unsigned char HASH_OID_SHA1[] = {
- 0x05, 0x2B, 0x0E, 0x03, 0x02, 0x1A
-};
-
-static const unsigned char HASH_OID_SHA224[] = {
- 0x09, 0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02, 0x04
-};
-
-static const unsigned char HASH_OID_SHA256[] = {
- 0x09, 0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02, 0x01
-};
-
-static const unsigned char HASH_OID_SHA384[] = {
- 0x09, 0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02, 0x02
-};
-
-static const unsigned char HASH_OID_SHA512[] = {
- 0x09, 0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02, 0x03
-};
-
-static const unsigned char *HASH_OID[] = {
- HASH_OID_SHA1,
- HASH_OID_SHA224,
- HASH_OID_SHA256,
- HASH_OID_SHA384,
- HASH_OID_SHA512
-};
-
-static const br_hash_class *
-get_hash_impl(int hash_id)
-{
- size_t u;
-
- for (u = 0; hash_functions[u].name; u ++) {
- const br_hash_class *hc;
- int id;
-
- hc = hash_functions[u].hclass;
- id = (hc->desc >> BR_HASHDESC_ID_OFF) & BR_HASHDESC_ID_MASK;
- if (id == hash_id) {
- return hc;
- }
- }
- return NULL;
-}
-
static size_t
sp_do_sign(const br_ssl_server_policy_class **pctx,
int hash_id, size_t hv_len, unsigned char *data, size_t len)
const br_hash_class *hc;
case BR_KEYTYPE_RSA:
- if (hash_id == 0) {
- hash_oid = NULL;
- } else if (hash_id >= 2 && hash_id <= 6) {
- hash_oid = HASH_OID[hash_id - 2];
- } else {
+ hash_oid = get_hash_oid(hash_id);
+ if (hash_oid == NULL && hash_id != 0) {
if (pc->verbose) {
fprintf(stderr, "ERROR: cannot RSA-sign with"
" unknown hash function: %d\n",
hc = get_hash_impl(hash_id);
if (hc == NULL) {
if (pc->verbose) {
- fprintf(stderr, "ERROR: cannot RSA-sign with"
+ fprintf(stderr, "ERROR: cannot ECDSA-sign with"
" unknown hash function: %d\n",
hash_id);
}
size_t chain_len;
int cert_signer_algo;
private_key *sk;
+ anchor_list anchors = VEC_INIT;
+ br_x509_minimal_context xc;
+ const br_hash_class *dnhash;
size_t u;
br_ssl_server_context cc;
policy_context pc;
usage_server();
goto server_exit_error;
}
- iobuf_len = strtoul(arg, 0, 10);
+ iobuf_len = parse_size(arg);
+ if (iobuf_len == (size_t)-1) {
+ usage_server();
+ goto server_exit_error;
+ }
} else if (eqstr(arg, "-cache")) {
if (++ i >= argc) {
fprintf(stderr,
usage_server();
goto server_exit_error;
}
- cache_len = strtoul(arg, 0, 10);
+ cache_len = parse_size(arg);
+ if (cache_len == (size_t)-1) {
+ usage_server();
+ goto server_exit_error;
+ }
} else if (eqstr(arg, "-cert")) {
if (++ i >= argc) {
fprintf(stderr,
if (sk == NULL) {
goto server_exit_error;
}
+ } else if (eqstr(arg, "-CA")) {
+ if (++ i >= argc) {
+ fprintf(stderr,
+ "ERROR: no argument for '-CA'\n");
+ usage_server();
+ goto server_exit_error;
+ }
+ arg = argv[i];
+ if (read_trust_anchors(&anchors, arg) == 0) {
+ usage_server();
+ goto server_exit_error;
+ }
+ } else if (eqstr(arg, "-anon_ok")) {
+ flags |= BR_OPT_TOLERATE_NO_CLIENT_AUTH;
} else if (eqstr(arg, "-list")) {
list_names();
goto server_exit;
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();
break;
}
cert_signer_algo = get_cert_signer_algo(chain);
- if (cert_signer_algo < 0) {
- fprintf(stderr, "ERROR: server certificate cannot be"
- " decoded (err=%d)\n", -cert_signer_algo);
+ if (cert_signer_algo == 0) {
goto server_exit_error;
- } else if (verbose) {
+ }
+ if (verbose) {
const char *csas;
switch (cert_signer_algo) {
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");
&br_sslrec_in_gcm_vtable,
&br_sslrec_out_gcm_vtable);
}
+ if ((req & REQ_CHAPOL) != 0) {
+ br_ssl_engine_set_chacha20(&cc.eng,
+ &br_chacha20_ct_run);
+ br_ssl_engine_set_poly1305(&cc.eng,
+ &br_poly1305_ctmul_run);
+ br_ssl_engine_set_chapol(&cc.eng,
+ &br_sslrec_in_chapol_vtable,
+ &br_sslrec_out_chapol_vtable);
+ }
if ((req & REQ_3DESCBC) != 0) {
br_ssl_engine_set_des_cbc(&cc.eng,
&br_des_ct_cbcenc_vtable,
}
br_ssl_engine_set_suites(&cc.eng, suite_ids, num_suites);
+ dnhash = NULL;
for (u = 0; hash_functions[u].name; u ++) {
const br_hash_class *hc;
int id;
hc = hash_functions[u].hclass;
id = (hc->desc >> BR_HASHDESC_ID_OFF) & BR_HASHDESC_ID_MASK;
if ((hfuns & ((unsigned)1 << id)) != 0) {
+ dnhash = hc;
br_ssl_engine_set_hash(&cc.eng, id, hc);
}
}
br_ssl_session_cache_lru_init(&lru, cache, cache_len);
br_ssl_server_set_cache(&cc, &lru.vtable);
+ /*
+ * Set the policy handler (that chooses the actual cipher suite,
+ * selects the certificate chain, and runs the private key
+ * operations).
+ */
pc.vtable = &policy_vtable;
pc.verbose = verbose;
pc.chain = chain;
pc.sk = sk;
br_ssl_server_set_policy(&cc, &pc.vtable);
+ /*
+ * If trust anchors have been configured, then set an X.509
+ * validation engine and activate client certificate
+ * authentication.
+ */
+ if (VEC_LEN(anchors) != 0) {
+ br_x509_minimal_init(&xc, dnhash,
+ &VEC_ELT(anchors, 0), VEC_LEN(anchors));
+ for (u = 0; hash_functions[u].name; u ++) {
+ const br_hash_class *hc;
+ int id;
+
+ hc = hash_functions[u].hclass;
+ id = (hc->desc >> BR_HASHDESC_ID_OFF)
+ & BR_HASHDESC_ID_MASK;
+ if ((hfuns & ((unsigned)1 << id)) != 0) {
+ br_x509_minimal_set_hash(&xc, id, hc);
+ }
+ }
+ br_ssl_engine_set_rsavrfy(&cc.eng, &br_rsa_i31_pkcs1_vrfy);
+ br_ssl_engine_set_ec(&cc.eng, &br_ec_prime_i31);
+ br_ssl_engine_set_ecdsa(&cc.eng, &br_ecdsa_i31_vrfy_asn1);
+ br_x509_minimal_set_rsa(&xc, &br_rsa_i31_pkcs1_vrfy);
+ br_x509_minimal_set_ecdsa(&xc,
+ &br_ec_prime_i31, &br_ecdsa_i31_vrfy_asn1);
+ br_ssl_engine_set_x509(&cc.eng, &xc.vtable);
+ br_ssl_server_set_trust_anchor_names_alt(&cc,
+ &VEC_ELT(anchors, 0), VEC_LEN(anchors));
+ }
+
br_ssl_engine_set_buffer(&cc.eng, iobuf, iobuf_len, bidi);
+ /*
+ * We need to ignore SIGPIPE.
+ */
+ signal(SIGPIPE, SIG_IGN);
+
/*
* Open the server socket.
*/
server_exit:
xfree(suites);
xfree(suite_ids);
- if (chain != NULL) {
- for (u = 0; u < chain_len; u ++) {
- xfree(chain[u].data);
- }
- xfree(chain);
- }
- if (sk != NULL) {
- free_private_key(sk);
- }
+ free_certificates(chain, chain_len);
+ free_private_key(sk);
+ VEC_CLEAREXT(anchors, &free_ta_contents);
xfree(iobuf);
xfree(cache);
if (fd >= 0) {
projects / BearSSL / blobdiff