X-Git-Url: https://www.bearssl.org/gitweb//home/git/?p=BearSSL;a=blobdiff_plain;f=samples%2Fserver_basic.c;h=3b4c3122acffac0b605e2e72c455b253abe543c1;hp=fdd801eb44876f145076360881ae1bb343d234cf;hb=ef318ef83a3a58b0a9e036676b84d11261ed7bb4;hpb=3210f38e0491b39aec1ef419cb4114e9483089fb;ds=sidebyside

diff --git a/samples/server_basic.c b/samples/server_basic.c
index fdd801e..3b4c312 100644
--- a/samples/server_basic.c
+++ b/samples/server_basic.c
@@ -27,6 +27,7 @@
 #include <string.h>
 #include <stdint.h>
 #include <errno.h>
+#include <signal.h>
 
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -45,6 +46,22 @@
  *
  * The macros below define which chain is selected. This impacts the list
  * of supported cipher suites.
+ *
+ * Other macros, which can be defined (with a non-zero value):
+ *
+ *   SERVER_PROFILE_MIN_FS
+ *      Select a "minimal" profile with forward security (ECDHE cipher
+ *      suite).
+ *
+ *   SERVER_PROFILE_MIN_NOFS
+ *      Select a "minimal" profile without forward security (RSA or ECDH
+ *      cipher suite, but not ECDHE).
+ *
+ *   SERVER_CHACHA20
+ *      If SERVER_PROFILE_MIN_FS is selected, then this macro selects
+ *      a cipher suite with ChaCha20+Poly1305; otherwise, AES/GCM is
+ *      used. This macro has no effect otherwise, since there is no
+ *      non-forward secure cipher suite that uses ChaCha20+Poly1305.
  */
 
 #if !(SERVER_RSA || SERVER_EC || SERVER_MIXED)
@@ -278,6 +295,11 @@ main(int argc, char *argv[])
 	}
 	port = argv[1];
 
+	/*
+	 * Ignore SIGPIPE to avoid crashing in case of abrupt socket close.
+	 */
+	signal(SIGPIPE, SIG_IGN);
+
 	/*
 	 * Open the server socket.
 	 */
@@ -316,7 +338,11 @@ main(int argc, char *argv[])
 		 */
 #if SERVER_RSA
 #if SERVER_PROFILE_MIN_FS
+#if SERVER_CHACHA20
+		br_ssl_server_init_mine2c(&sc, CHAIN, CHAIN_LEN, &SKEY);
+#else
 		br_ssl_server_init_mine2g(&sc, CHAIN, CHAIN_LEN, &SKEY);
+#endif
 #elif SERVER_PROFILE_MIN_NOFS
 		br_ssl_server_init_minr2g(&sc, CHAIN, CHAIN_LEN, &SKEY);
 #else
@@ -324,7 +350,11 @@ main(int argc, char *argv[])
 #endif
 #elif SERVER_EC
 #if SERVER_PROFILE_MIN_FS
+#if SERVER_CHACHA20
+		br_ssl_server_init_minf2c(&sc, CHAIN, CHAIN_LEN, &SKEY);
+#else
 		br_ssl_server_init_minf2g(&sc, CHAIN, CHAIN_LEN, &SKEY);
+#endif
 #elif SERVER_PROFILE_MIN_NOFS
 		br_ssl_server_init_minv2g(&sc, CHAIN, CHAIN_LEN, &SKEY);
 #else
@@ -333,7 +363,11 @@ main(int argc, char *argv[])
 #endif
 #else /* SERVER_MIXED */
 #if SERVER_PROFILE_MIN_FS
+#if SERVER_CHACHA20
+		br_ssl_server_init_minf2c(&sc, CHAIN, CHAIN_LEN, &SKEY);
+#else
 		br_ssl_server_init_minf2g(&sc, CHAIN, CHAIN_LEN, &SKEY);
+#endif
 #elif SERVER_PROFILE_MIN_NOFS
 		br_ssl_server_init_minu2g(&sc, CHAIN, CHAIN_LEN, &SKEY);
 #else