summaryrefslogtreecommitdiffstats
path: root/ssl/statem
diff options
context:
space:
mode:
authorMatt Caswell <matt@openssl.org>2015-12-14 09:57:06 +0000
committerMatt Caswell <matt@openssl.org>2015-12-15 11:22:34 +0000
commitbbf431cb5e4188645d602f0ad42bca145a099466 (patch)
tree9f69790a15566c314319ea3793f933d9968d108b /ssl/statem
parent0c497e96c42c4b466676d495b0c9bd72e27f7bd8 (diff)
Fix compile failure with no-srp
Reviewed-by: Tim Hudson <tjh@openssl.org>
Diffstat (limited to 'ssl/statem')
-rw-r--r--ssl/statem/statem_clnt.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/ssl/statem/statem_clnt.c b/ssl/statem/statem_clnt.c
index 7c98228b42..633e67731c 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)