wbrawner/openssl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Simplify code around next_proto.len by changing 'len' data type.

Browse source 
clean an useless static qualifier and a dead comment.

Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2278)
This commit is contained in:
FdaSilvaYY 2016-12-06 00:42:01 +01:00 committed by Richard Levitte
parent 0ae407eebe
commit f2ff1432fc
1 changed files with 6 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
apps/s_server.c
View file

@ -106,8 +106,6 @@ static DH *load_dh_param(const char *dhfile);
#endif #endif
static void print_connection_info(SSL *con); static void print_connection_info(SSL *con);
/* static int load_CA(SSL_CTX *ctx, char *file);*/
static const int bufsize = 16 * 1024; static const int bufsize = 16 * 1024;
static int accept_socket = -1; static int accept_socket = -1;
@ -140,14 +138,13 @@ static const char *session_id_prefix = NULL;
#ifndef OPENSSL_NO_DTLS #ifndef OPENSSL_NO_DTLS
static int enable_timeouts = 0; static int enable_timeouts = 0;
static long socket_mtu; static long socket_mtu;
#endif
static int dtlslisten = 0; static int dtlslisten = 0;
#endif
static int early_data = 0; static int early_data = 0;
#ifndef OPENSSL_NO_PSK #ifndef OPENSSL_NO_PSK
static char *psk_identity = "Client_identity"; static const char psk_identity[] = "Client_identity";
char *psk_key = NULL; /* by default PSK is not used */ char *psk_key = NULL; /* by default PSK is not used */
static unsigned int psk_server_cb(SSL *ssl, const char *identity, static unsigned int psk_server_cb(SSL *ssl, const char *identity,
@ -452,7 +449,6 @@ static int ssl_servername_cb(SSL *s, int *ad, void *arg)
} }
/* Structure passed to cert status callback */ /* Structure passed to cert status callback */
typedef struct tlsextstatusctx_st { typedef struct tlsextstatusctx_st {
int timeout; int timeout;
/* File to load OCSP Response from (or NULL if no file) */ /* File to load OCSP Response from (or NULL if no file) */
@ -632,7 +628,7 @@ static int cert_status_cb(SSL *s, void *arg)
/* This is the context that we pass to next_proto_cb */ /* This is the context that we pass to next_proto_cb */
typedef struct tlsextnextprotoctx_st { typedef struct tlsextnextprotoctx_st {
unsigned char *data; unsigned char *data;
unsigned int len; size_t len;
} tlsextnextprotoctx; } tlsextnextprotoctx;
static int next_proto_cb(SSL *s, const unsigned char **data, static int next_proto_cb(SSL *s, const unsigned char **data,
@ -978,7 +974,7 @@ int s_server_main(int argc, char *argv[])
tlsextalpnctx alpn_ctx = { NULL, 0 }; tlsextalpnctx alpn_ctx = { NULL, 0 };
#ifndef OPENSSL_NO_PSK #ifndef OPENSSL_NO_PSK
/* by default do not send a PSK identity hint */ /* by default do not send a PSK identity hint */
static char *psk_identity_hint = NULL; char *psk_identity_hint = NULL;
char *p; char *p;
#endif #endif
#ifndef OPENSSL_NO_SRP #ifndef OPENSSL_NO_SRP
@ -1606,22 +1602,16 @@ int s_server_main(int argc, char *argv[])
} }
#if !defined(OPENSSL_NO_NEXTPROTONEG) #if !defined(OPENSSL_NO_NEXTPROTONEG)
if (next_proto_neg_in) { if (next_proto_neg_in) {
size_t len; next_proto.data = next_protos_parse(&next_proto.len, next_proto_neg_in);
next_proto.data = next_protos_parse(&len, next_proto_neg_in);
if (next_proto.data == NULL) if (next_proto.data == NULL)
goto end; goto end;
next_proto.len = len;
} else {
next_proto.data = NULL;
} }
#endif #endif
alpn_ctx.data = NULL; alpn_ctx.data = NULL;
if (alpn_in) { if (alpn_in) {
size_t len; alpn_ctx.data = next_protos_parse(&alpn_ctx.len, alpn_in);
alpn_ctx.data = next_protos_parse(&len, alpn_in);
if (alpn_ctx.data == NULL) if (alpn_ctx.data == NULL)
goto end; goto end;
alpn_ctx.len = len;
} }
if (crl_file) { if (crl_file) {