diff options
| author | dtucker@openbsd.org <dtucker@openbsd.org> | 2020-11-08 12:46:12 +0100 |
|---|---|---|
| committer | Darren Tucker <dtucker@dtucker.net> | 2020-11-08 14:02:27 +0100 |
| commit | 4d94b031ff88b015f0db57e140f481bff7ae1a91 (patch) | |
| tree | 3cd23c4816252f9e5b11bad31bbf0d335398582f /sshkey.h | |
| parent | Fix function body for variadic macro test. (diff) | |
| download | openssh-4d94b031ff88b015f0db57e140f481bff7ae1a91.tar.xz openssh-4d94b031ff88b015f0db57e140f481bff7ae1a91.zip | |
upstream: 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@
OpenBSD-Commit-ID: cc12a9029833d222043aecd252d654965c351a69
Diffstat (limited to 'sshkey.h')
| -rw-r--r-- | sshkey.h | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -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. @@ -39,6 +39,7 @@ # define EC_GROUP void # define EC_POINT void # endif /* OPENSSL_HAS_ECC */ +#define SSH_OPENSSL_VERSION OpenSSL_version(OPENSSL_VERSION) #else /* WITH_OPENSSL */ # define BIGNUM void # define RSA void @@ -46,6 +47,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 |