提交 c2f9648d 编写于 作者: M Matt Caswell

Add the ability for s_server to operate statelessly

Reviewed-by: NBen Kaduk <kaduk@mit.edu>
(Merged from https://github.com/openssl/openssl/pull/4435)
上级 e9359719
...@@ -114,6 +114,7 @@ static long socket_mtu; ...@@ -114,6 +114,7 @@ static long socket_mtu;
* code. * code.
*/ */
static int dtlslisten = 0; static int dtlslisten = 0;
static int stateless = 0;
static int early_data = 0; static int early_data = 0;
static SSL_SESSION *psksess = NULL; static SSL_SESSION *psksess = NULL;
...@@ -751,7 +752,7 @@ typedef enum OPTION_choice { ...@@ -751,7 +752,7 @@ typedef enum OPTION_choice {
OPT_UPPER_WWW, OPT_HTTP, OPT_ASYNC, OPT_SSL_CONFIG, OPT_UPPER_WWW, OPT_HTTP, OPT_ASYNC, OPT_SSL_CONFIG,
OPT_MAX_SEND_FRAG, OPT_SPLIT_SEND_FRAG, OPT_MAX_PIPELINES, OPT_READ_BUF, OPT_MAX_SEND_FRAG, OPT_SPLIT_SEND_FRAG, OPT_MAX_PIPELINES, OPT_READ_BUF,
OPT_SSL3, OPT_TLS1_3, OPT_TLS1_2, OPT_TLS1_1, OPT_TLS1, OPT_DTLS, OPT_DTLS1, OPT_SSL3, OPT_TLS1_3, OPT_TLS1_2, OPT_TLS1_1, OPT_TLS1, OPT_DTLS, OPT_DTLS1,
OPT_DTLS1_2, OPT_SCTP, OPT_TIMEOUT, OPT_MTU, OPT_LISTEN, OPT_DTLS1_2, OPT_SCTP, OPT_TIMEOUT, OPT_MTU, OPT_LISTEN, OPT_STATELESS,
OPT_ID_PREFIX, OPT_SERVERNAME, OPT_SERVERNAME_FATAL, OPT_ID_PREFIX, OPT_SERVERNAME, OPT_SERVERNAME_FATAL,
OPT_CERT2, OPT_KEY2, OPT_NEXTPROTONEG, OPT_ALPN, OPT_CERT2, OPT_KEY2, OPT_NEXTPROTONEG, OPT_ALPN,
OPT_SRTP_PROFILES, OPT_KEYMATEXPORT, OPT_KEYMATEXPORTLEN, OPT_SRTP_PROFILES, OPT_KEYMATEXPORT, OPT_KEYMATEXPORTLEN,
...@@ -933,6 +934,7 @@ const OPTIONS s_server_options[] = { ...@@ -933,6 +934,7 @@ const OPTIONS s_server_options[] = {
{"listen", OPT_LISTEN, '-', {"listen", OPT_LISTEN, '-',
"Listen for a DTLS ClientHello with a cookie and then connect"}, "Listen for a DTLS ClientHello with a cookie and then connect"},
#endif #endif
{"stateless", OPT_STATELESS, '-', "Require TLSv1.3 cookies"},
#ifndef OPENSSL_NO_DTLS1 #ifndef OPENSSL_NO_DTLS1
{"dtls1", OPT_DTLS1, '-', "Just talk DTLSv1"}, {"dtls1", OPT_DTLS1, '-', "Just talk DTLSv1"},
#endif #endif
...@@ -1496,6 +1498,9 @@ int s_server_main(int argc, char *argv[]) ...@@ -1496,6 +1498,9 @@ int s_server_main(int argc, char *argv[])
dtlslisten = 1; dtlslisten = 1;
#endif #endif
break; break;
case OPT_STATELESS:
stateless = 1;
break;
case OPT_ID_PREFIX: case OPT_ID_PREFIX:
session_id_prefix = opt_arg(); session_id_prefix = opt_arg();
break; break;
...@@ -1588,6 +1593,11 @@ int s_server_main(int argc, char *argv[]) ...@@ -1588,6 +1593,11 @@ int s_server_main(int argc, char *argv[])
} }
#endif #endif
if (stateless && socket_type != SOCK_STREAM) {
BIO_printf(bio_err, "Can only use --stateless with TLS\n");
goto end;
}
#ifdef AF_UNIX #ifdef AF_UNIX
if (socket_family == AF_UNIX && socket_type != SOCK_STREAM) { if (socket_family == AF_UNIX && socket_type != SOCK_STREAM) {
BIO_printf(bio_err, BIO_printf(bio_err,
...@@ -2691,19 +2701,23 @@ static int init_ssl_connection(SSL *con) ...@@ -2691,19 +2701,23 @@ static int init_ssl_connection(SSL *con)
long verify_err; long verify_err;
int retry = 0; int retry = 0;
#ifndef OPENSSL_NO_DTLS if (dtlslisten || stateless) {
if (dtlslisten) {
BIO_ADDR *client = NULL; BIO_ADDR *client = NULL;
if (dtlslisten) {
if ((client = BIO_ADDR_new()) == NULL) { if ((client = BIO_ADDR_new()) == NULL) {
BIO_printf(bio_err, "ERROR - memory\n"); BIO_printf(bio_err, "ERROR - memory\n");
return 0; return 0;
} }
i = DTLSv1_listen(con, client); i = DTLSv1_listen(con, client);
} else {
i = SSL_stateless(con);
}
if (i > 0) { if (i > 0) {
BIO *wbio; BIO *wbio;
int fd = -1; int fd = -1;
if (dtlslisten) {
wbio = SSL_get_wbio(con); wbio = SSL_get_wbio(con);
if (wbio) { if (wbio) {
BIO_get_fd(wbio, &fd); BIO_get_fd(wbio, &fd);
...@@ -2716,13 +2730,14 @@ static int init_ssl_connection(SSL *con) ...@@ -2716,13 +2730,14 @@ static int init_ssl_connection(SSL *con)
} }
BIO_ADDR_free(client); BIO_ADDR_free(client);
dtlslisten = 0; dtlslisten = 0;
} else {
stateless = 0;
}
i = SSL_accept(con); i = SSL_accept(con);
} else { } else {
BIO_ADDR_free(client); BIO_ADDR_free(client);
} }
} else } else {
#endif
do { do {
i = SSL_accept(con); i = SSL_accept(con);
...@@ -2762,10 +2777,11 @@ static int init_ssl_connection(SSL *con) ...@@ -2762,10 +2777,11 @@ static int init_ssl_connection(SSL *con)
} }
#endif #endif
} while (i < 0 && SSL_waiting_for_async(con)); } while (i < 0 && SSL_waiting_for_async(con));
}
if (i <= 0) { if (i <= 0) {
if ((dtlslisten && i == 0) if (((dtlslisten || stateless) && i == 0)
|| (!dtlslisten && retry)) { || (!dtlslisten && !stateless && retry)) {
BIO_printf(bio_s_out, "DELAY\n"); BIO_printf(bio_s_out, "DELAY\n");
return 1; return 1;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册