diff options
| author | Darren Tucker <dtucker@cvs.openbsd.org> | 2020-11-08 11:46:13 +0000 |
|---|---|---|
| committer | Darren Tucker <dtucker@cvs.openbsd.org> | 2020-11-08 11:46:13 +0000 |
| commit | 9e9be417fe2c08da3712b7d9012901cb512b84b7 (patch) | |
| tree | 1d8fcbbb1d76e8c660722fa7427d7be626bfe647 /usr.bin/ssh/sshkey.h | |
| parent | 276bdb2dba66e54229fc57e8fcca5df5d9d13bac (diff) | |
Replace WITH_OPENSSL ifdefs in log calls with a macro. The log calls
are themselves now macros, and preprocessor directives inside macro
arguments are undefined behaviour which some compilers (eg old GCCs)
choke on. It also makes the code tidier. ok deraadt@
Diffstat (limited to 'usr.bin/ssh/sshkey.h')
| -rw-r--r-- | usr.bin/ssh/sshkey.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/usr.bin/ssh/sshkey.h b/usr.bin/ssh/sshkey.h index df3ceee67a2..c56267b5395 100644 --- a/usr.bin/ssh/sshkey.h +++ b/usr.bin/ssh/sshkey.h @@ -1,4 +1,4 @@ -/* $OpenBSD: sshkey.h,v 1.47 2020/10/19 22:49:23 dtucker Exp $ */ +/* $OpenBSD: sshkey.h,v 1.48 2020/11/08 11:46:12 dtucker Exp $ */ /* * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. @@ -33,6 +33,7 @@ #include <openssl/dsa.h> #include <openssl/ec.h> #include <openssl/ecdsa.h> +#define SSH_OPENSSL_VERSION OpenSSL_version(OPENSSL_VERSION) #else /* OPENSSL */ #define BIGNUM void #define RSA void @@ -40,6 +41,7 @@ #define EC_KEY void #define EC_GROUP void #define EC_POINT void +#define SSH_OPENSSL_VERSION "without OpenSSL" #endif /* WITH_OPENSSL */ #define SSH_RSA_MINIMUM_MODULUS_SIZE 1024 |