The branch master has been updated via 73cd6175b970fa63c9c70d769febd91f3c7b5cdd (commit) via bbf431cb5e4188645d602f0ad42bca145a099466 (commit) from 0c497e96c42c4b466676d495b0c9bd72e27f7bd8 (commit)
- Log ----------------------------------------------------------------- commit 73cd6175b970fa63c9c70d769febd91f3c7b5cdd Author: Matt Caswell <m...@openssl.org> Date: Mon Dec 14 09:58:55 2015 +0000 Fix no-psk compile failure Reviewed-by: Tim Hudson <t...@openssl.org> commit bbf431cb5e4188645d602f0ad42bca145a099466 Author: Matt Caswell <m...@openssl.org> Date: Mon Dec 14 09:57:06 2015 +0000 Fix compile failure with no-srp Reviewed-by: Tim Hudson <t...@openssl.org> ----------------------------------------------------------------------- Summary of changes: apps/ciphers.c | 2 ++ ssl/statem/statem_clnt.c | 8 +++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/apps/ciphers.c b/apps/ciphers.c index 12dca50..d5a7631 100644 --- a/apps/ciphers.c +++ b/apps/ciphers.c @@ -93,6 +93,7 @@ OPTIONS ciphers_options[] = { {NULL} }; +#ifndef OPENSSL_NO_PSK static unsigned int dummy_psk(SSL *ssl, const char *hint, char *identity, unsigned int max_identity_len, unsigned char *psk, @@ -100,6 +101,7 @@ static unsigned int dummy_psk(SSL *ssl, const char *hint, char *identity, { return 0; } +#endif int ciphers_main(int argc, char **argv) { diff --git a/ssl/statem/statem_clnt.c b/ssl/statem/statem_clnt.c index 7c98228..633e677 100644 --- a/ssl/statem/statem_clnt.c +++ b/ssl/statem/statem_clnt.c @@ -1651,8 +1651,14 @@ MSG_PROCESS_RETURN tls_process_key_exchange(SSL *s, PACKET *pkt) if (alg_k & (SSL_kPSK | SSL_kRSAPSK)) { } else #endif /* !OPENSSL_NO_PSK */ + /* + * Dummy "if" to ensure sane C code in the event of various OPENSSL_NO_* + * options + */ + if (0) { + } #ifndef OPENSSL_NO_SRP - if (alg_k & SSL_kSRP) { + else if (alg_k & SSL_kSRP) { PACKET prime, generator, salt, server_pub; if (!PACKET_get_length_prefixed_2(pkt, &prime) || !PACKET_get_length_prefixed_2(pkt, &generator) _____ openssl-commits mailing list To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits