The branch master has been updated via 30d1bab146ffef92376f09b7372aac7a75281627 (commit) from 83750d9b2b51bb622138d48fc82eb408b64d8057 (commit)
- Log ----------------------------------------------------------------- commit 30d1bab146ffef92376f09b7372aac7a75281627 Author: Matt Caswell <m...@openssl.org> Date: Thu Mar 2 23:53:30 2017 +0000 Silence some clang warnings Reviewed-by: Rich Salz <rs...@openssl.org> (Merged from https://github.com/openssl/openssl/pull/2831) ----------------------------------------------------------------------- Summary of changes: apps/s_server.c | 2 +- ssl/statem/extensions_srvr.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/s_server.c b/apps/s_server.c index 3190eab..57bae82 100644 --- a/apps/s_server.c +++ b/apps/s_server.c @@ -148,7 +148,7 @@ static int dtlslisten = 0; static char *psk_identity = "Client_identity"; char *psk_key = NULL; /* by default PSK is not used */ -int early_data = 0; +static int early_data = 0; static unsigned int psk_server_cb(SSL *ssl, const char *identity, unsigned char *psk, diff --git a/ssl/statem/extensions_srvr.c b/ssl/statem/extensions_srvr.c index c613143..83fb713 100644 --- a/ssl/statem/extensions_srvr.c +++ b/ssl/statem/extensions_srvr.c @@ -681,7 +681,7 @@ int tls_parse_ctos_psk(SSL *s, PACKET *pkt, unsigned int context, X509 *x, SSL_SESSION *sess = NULL; unsigned int id, i; const EVP_MD *md = NULL; - uint32_t ticket_age, now, agesec, agems; + uint32_t ticket_age = 0, now, agesec, agems; /* * If we have no PSK kex mode that we recognise then we can't resume so _____ openssl-commits mailing list To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits