Commit 14d4d7ed authored by FdaSilvaYY's avatar FdaSilvaYY Committed by Richard Levitte
Browse files

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



clean an useless static qualifier and a dead comment.

Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2278)

(cherry picked from commit f2ff1432)
parent ef727bc5

apps/s_server.c

+6 −16
Original line number Diff line number Diff line
@@ -105,8 +105,6 @@ static void free_sessions(void); 
static DH *load_dh_param(const char *dhfile);

#endif



/* static int load_CA(SSL_CTX *ctx, char *file);*/



static const int bufsize = 16 * 1024;

static int accept_socket = -1;
@@ -139,12 +137,11 @@ static const char *session_id_prefix = NULL; 
#ifndef OPENSSL_NO_DTLS

static int enable_timeouts = 0;

static long socket_mtu;



#endif

static int dtlslisten = 0;

#endif



#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 */



static unsigned int psk_server_cb(SSL *ssl, const char *identity,
@@ -449,7 +446,6 @@ static int ssl_servername_cb(SSL *s, int *ad, void *arg) 
}



/* Structure passed to cert status callback */



typedef struct tlsextstatusctx_st {

    /* Default responder to use */

    char *host, *path, *port;
@@ -584,7 +580,7 @@ static int cert_status_cb(SSL *s, void *arg) 
/* This is the context that we pass to next_proto_cb */

typedef struct tlsextnextprotoctx_st {

    unsigned char *data;

    unsigned int len;

    size_t len;

} tlsextnextprotoctx;



static int next_proto_cb(SSL *s, const unsigned char **data,
@@ -919,7 +915,7 @@ int s_server_main(int argc, char *argv[]) 
    tlsextalpnctx alpn_ctx = { NULL, 0 };

#ifndef OPENSSL_NO_PSK

    /* by default do not send a PSK identity hint */

    static char *psk_identity_hint = NULL;

    char *psk_identity_hint = NULL;

    char *p;

#endif

#ifndef OPENSSL_NO_SRP
@@ -1519,22 +1515,16 @@ int s_server_main(int argc, char *argv[]) 
    }

#if !defined(OPENSSL_NO_NEXTPROTONEG)

    if (next_proto_neg_in) {

        size_t len;

        next_proto.data = next_protos_parse(&len, next_proto_neg_in);

        next_proto.data = next_protos_parse(&next_proto.len, next_proto_neg_in);

        if (next_proto.data == NULL)

            goto end;

        next_proto.len = len;

    } else {

        next_proto.data = NULL;

    }

#endif

    alpn_ctx.data = NULL;

    if (alpn_in) {

        size_t len;

        alpn_ctx.data = next_protos_parse(&len, alpn_in);

        alpn_ctx.data = next_protos_parse(&alpn_ctx.len, alpn_in);

        if (alpn_ctx.data == NULL)

            goto end;

        alpn_ctx.len = len;

    }



    if (crl_file) {