X-Git-Url: https://www.bearssl.org/gitweb//home/git/?p=BearSSL;a=blobdiff_plain;f=tools%2Fserver.c;h=8fcf2ebabbb691024fcc726bdd87575acc798ee0;hp=fbc778686eda58fb886138b5b9b1ea04b37c1a16;hb=8e86598b33f9df81d1f77d6cc32568d9ae119d67;hpb=3f00688b9d9f483a6ca97e659eea104995ea15b7

diff --git a/tools/server.c b/tools/server.c
index fbc7786..8fcf2eb 100644
--- a/tools/server.c
+++ b/tools/server.c
@@ -75,7 +75,7 @@ host_bind(const char *host, const char *port, int verbose)
 
 		sa = (struct sockaddr *)p->ai_addr;
 		if (sa->sa_family == AF_INET) {
-			sa4 = *(struct sockaddr_in *)sa;
+			memcpy(&sa4, sa, sizeof sa4);
 			sa = (struct sockaddr *)&sa4;
 			sa_len = sizeof sa4;
 			addr = &sa4.sin_addr;
@@ -83,7 +83,7 @@ host_bind(const char *host, const char *port, int verbose)
 				sa4.sin_addr.s_addr = INADDR_ANY;
 			}
 		} else if (sa->sa_family == AF_INET6) {
-			sa6 = *(struct sockaddr_in6 *)sa;
+			memcpy(&sa6, sa, sizeof sa6);
 			sa = (struct sockaddr *)&sa6;
 			sa_len = sizeof sa6;
 			addr = &sa6.sin6_addr;
@@ -119,9 +119,16 @@ host_bind(const char *host, const char *port, int verbose)
 		opt = 1;
 		setsockopt(fd, SOL_SOCKET, SO_REUSEADDR,
 			(void *)&opt, sizeof opt);
+#ifdef IPV6_V6ONLY
+		/*
+		 * We want to make sure that the server socket works for
+		 * both IPv4 and IPv6. But IPV6_V6ONLY is not defined on
+		 * some very old systems.
+		 */
 		opt = 0;
 		setsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY,
 			(void *)&opt, sizeof opt);
+#endif
 		if (bind(fd, sa, sa_len) < 0) {
 			if (verbose) {
 				perror("bind()");
@@ -159,7 +166,7 @@ host_bind(const char *host, const char *port, int verbose)
 }
 
 static SOCKET
-accept_client(SOCKET server_fd, int verbose)
+accept_client(SOCKET server_fd, int verbose, int nonblock)
 {
 	int fd;
 	SOCKADDR_STORAGE sa;
@@ -202,16 +209,16 @@ accept_client(SOCKET server_fd, int verbose)
 	 * We make the socket non-blocking, since we are going to use
 	 * poll() or select() to organise I/O.
 	 */
+	if (nonblock) {
 #ifdef _WIN32
-	{
 		u_long arg;
 
 		arg = 1;
 		ioctlsocket(fd, FIONBIO, &arg);
-	}
 #else
-	fcntl(fd, F_SETFL, O_NONBLOCK);
+		fcntl(fd, F_SETFL, O_NONBLOCK);
 #endif
+	}
 	return fd;
 }
 
@@ -475,14 +482,17 @@ sp_do_keyx(const br_ssl_server_policy_class **pctx,
 
 	pc = (policy_context *)pctx;
 	switch (pc->sk->key_type) {
+		const br_ec_impl *iec;
+
 	case BR_KEYTYPE_RSA:
 		return br_rsa_ssl_decrypt(
-			&br_rsa_i31_private, &pc->sk->key.rsa,
-			data, *len);
+			br_rsa_private_get_default(),
+			&pc->sk->key.rsa, data, *len);
 	case BR_KEYTYPE_EC:
-		r = br_ec_all_m15.mul(data, *len, pc->sk->key.ec.x,
+		iec = br_ec_get_default();
+		r = iec->mul(data, *len, pc->sk->key.ec.x,
 			pc->sk->key.ec.xlen, pc->sk->key.ec.curve);
-		xoff = br_ec_all_m15.xoff(pc->sk->key.ec.curve, &xlen);
+		xoff = iec->xoff(pc->sk->key.ec.curve, &xlen);
 		memmove(data, data + xoff, xlen);
 		*len = xlen;
 		return r;
@@ -556,8 +566,8 @@ sp_do_sign(const br_ssl_server_policy_class **pctx,
 			}
 			return 0;
 		}
-		x = br_rsa_i31_pkcs1_sign(hash_oid, hv, hv_len,
-			&pc->sk->key.rsa, data);
+		x = br_rsa_pkcs1_sign_get_default()(
+			hash_oid, hv, hv_len, &pc->sk->key.rsa, data);
 		if (!x) {
 			if (pc->verbose) {
 				fprintf(stderr, "ERROR: RSA-sign failure\n");
@@ -584,8 +594,8 @@ sp_do_sign(const br_ssl_server_policy_class **pctx,
 			}
 			return 0;
 		}
-		sig_len = br_ecdsa_i31_sign_asn1(&br_ec_all_m15, 
-			hc, hv, &pc->sk->key.ec, data);
+		sig_len = br_ecdsa_sign_asn1_get_default()(
+			br_ec_get_default(), hc, hv, &pc->sk->key.ec, data);
 		if (sig_len == 0) {
 			if (pc->verbose) {
 				fprintf(stderr, "ERROR: ECDSA-sign failure\n");
@@ -956,7 +966,7 @@ do_server(int argc, char *argv[])
 		break;
 	case BR_KEYTYPE_EC:
 		curve = sk->key.ec.curve;
-		supp = br_ec_all_m15.supported_curves;
+		supp = br_ec_get_default()->supported_curves;
 		if (curve > 31 || !((supp >> curve) & 1)) {
 			fprintf(stderr, "ERROR: private key curve (%d)"
 				" is not supported\n", curve);
@@ -1046,41 +1056,19 @@ do_server(int argc, char *argv[])
 		}
 		/* TODO: algorithm implementation selection */
 		if ((req & REQ_AESCBC) != 0) {
-			br_ssl_engine_set_aes_cbc(&cc.eng,
-				&br_aes_ct_cbcenc_vtable,
-				&br_aes_ct_cbcdec_vtable);
-			br_ssl_engine_set_cbc(&cc.eng,
-				&br_sslrec_in_cbc_vtable,
-				&br_sslrec_out_cbc_vtable);
+			br_ssl_engine_set_default_aes_cbc(&cc.eng);
 		}
 		if ((req & REQ_AESGCM) != 0) {
-			br_ssl_engine_set_aes_ctr(&cc.eng,
-				&br_aes_ct_ctr_vtable);
-			br_ssl_engine_set_ghash(&cc.eng,
-				&br_ghash_ctmul);
-			br_ssl_engine_set_gcm(&cc.eng,
-				&br_sslrec_in_gcm_vtable,
-				&br_sslrec_out_gcm_vtable);
+			br_ssl_engine_set_default_aes_gcm(&cc.eng);
 		}
 		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);
+			br_ssl_engine_set_default_chapol(&cc.eng);
 		}
 		if ((req & REQ_3DESCBC) != 0) {
-			br_ssl_engine_set_des_cbc(&cc.eng,
-				&br_des_ct_cbcenc_vtable,
-				&br_des_ct_cbcdec_vtable);
-			br_ssl_engine_set_cbc(&cc.eng,
-				&br_sslrec_in_cbc_vtable,
-				&br_sslrec_out_cbc_vtable);
+			br_ssl_engine_set_default_des_cbc(&cc.eng);
 		}
 		if ((req & (REQ_ECDHE_RSA | REQ_ECDHE_ECDSA)) != 0) {
-			br_ssl_engine_set_ec(&cc.eng, &br_ec_all_m15);
+			br_ssl_engine_set_default_ec(&cc.eng);
 		}
 	}
 	br_ssl_engine_set_suites(&cc.eng, suite_ids, num_suites);
@@ -1153,12 +1141,11 @@ do_server(int argc, char *argv[])
 				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_all_m15);
-		br_ssl_engine_set_ecdsa(&cc.eng, &br_ecdsa_i31_vrfy_asn1);
-		br_x509_minimal_set_rsa(&xc, &br_rsa_i31_pkcs1_vrfy);
+		br_ssl_engine_set_default_rsavrfy(&cc.eng);
+		br_ssl_engine_set_default_ecdsa(&cc.eng);
+		br_x509_minimal_set_rsa(&xc, br_rsa_pkcs1_vrfy_get_default());
 		br_x509_minimal_set_ecdsa(&xc,
-			&br_ec_all_m15, &br_ecdsa_i31_vrfy_asn1);
+			br_ec_get_default(), br_ecdsa_vrfy_asn1_get_default());
 		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));
@@ -1190,15 +1177,16 @@ do_server(int argc, char *argv[])
 	 */
 	for (;;) {
 		int x;
+		unsigned run_flags;
 
-		fd = accept_client(server_fd, verbose);
+		fd = accept_client(server_fd, verbose, 1);
 		if (fd == INVALID_SOCKET) {
 			goto server_exit_error;
 		}
 		br_ssl_server_reset(&cc);
-		x = run_ssl_engine(&cc.eng, fd,
-			(verbose ? RUN_ENGINE_VERBOSE : 0)
-			| (trace ? RUN_ENGINE_TRACE : 0));
+		run_flags = (verbose ? RUN_ENGINE_VERBOSE : 0)
+			| (trace ? RUN_ENGINE_TRACE : 0);
+		x = run_ssl_engine(&cc.eng, fd, run_flags);
 #ifdef _WIN32
 		closesocket(fd);
 #else