From: Darren Tucker <dtucker@dtucker.net>
Date: Sun, 8 Nov 2020 13:33:35 +0000 (+1100)
Subject: Remove preprocessor directive from log macro calls.
X-Git-Tag: V_8_5_P1~207
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=292bcb2479deb27204e3ff796539c003975a5f7a;p=thirdparty%2Fopenssh-portable.git

Remove preprocessor directive from log macro calls.

Preprocessor directives inside macro calls, such as the new log macros,
are undefined behaviour and do not work with, eg old GCCs.  Put the
entire log call inside the ifdef for OPENSSL_HAS_NISTP521.
---

diff --git a/ssh-keygen.c b/ssh-keygen.c
index 303faee31..23d273a96 100644
--- a/ssh-keygen.c
+++ b/ssh-keygen.c
@@ -219,10 +219,11 @@ type_bits_valid(int type, const char *name, u_int32_t *bitsp)
 		break;
 	case KEY_ECDSA:
 		if (sshkey_ecdsa_bits_to_nid(*bitsp) == -1)
-			fatal("Invalid ECDSA key length: valid lengths are "
 #ifdef OPENSSL_HAS_NISTP521
+			fatal("Invalid ECDSA key length: valid lengths are "
 			    "256, 384 or 521 bits");
 #else
+			fatal("Invalid ECDSA key length: valid lengths are "
 			    "256 or 384 bits");
 #endif
 	}