From 292bcb2479deb27204e3ff796539c003975a5f7a Mon Sep 17 00:00:00 2001 From: Darren Tucker Date: Mon, 9 Nov 2020 00:33:35 +1100 Subject: 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. --- ssh-keygen.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'ssh-keygen.c') diff --git a/ssh-keygen.c b/ssh-keygen.c index 303faee3..23d273a9 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 } -- cgit v1.2.1