From 5adf16f42971044fc22a21109dbf6f2208b03808 Mon Sep 17 00:00:00 2001 From: Lindsay Stewart Date: Mon, 5 Aug 2024 16:56:01 -0700 Subject: [PATCH] Actually fix build Make printing the libcrypto version best-effort to handle interned builds. --- bin/s2nc.c | 3 ++- bin/s2nd.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/bin/s2nc.c b/bin/s2nc.c index 5eacce55b62..9eaa602fc20 100644 --- a/bin/s2nc.c +++ b/bin/s2nc.c @@ -33,7 +33,6 @@ #include "api/unstable/npn.h" #include "api/unstable/renegotiate.h" #include "common.h" -#include "crypto/s2n_openssl.h" #include "error/s2n_errno.h" #include "tls/s2n_connection.h" @@ -564,7 +563,9 @@ int main(int argc, char *const *argv) } GUARD_EXIT(s2n_init(), "Error running s2n_init()"); +#ifdef SSLEAY_VERSION printf("libcrypto: %s\n", SSLeay_version(SSLEAY_VERSION)); +#endif if ((r = getaddrinfo(host, port, &hints, &ai_list)) != 0) { fprintf(stderr, "error: %s\n", gai_strerror(r)); diff --git a/bin/s2nd.c b/bin/s2nd.c index 296baeb36b0..2c321a7167a 100644 --- a/bin/s2nd.c +++ b/bin/s2nd.c @@ -34,7 +34,6 @@ #include "api/s2n.h" #include "api/unstable/npn.h" #include "common.h" -#include "crypto/s2n_openssl.h" #include "utils/s2n_safety.h" #define MAX_CERTIFICATES 50 @@ -563,7 +562,9 @@ int main(int argc, char *const *argv) } GUARD_EXIT(s2n_init(), "Error running s2n_init()"); +#ifdef SSLEAY_VERSION printf("libcrypto: %s\n", SSLeay_version(SSLEAY_VERSION)); +#endif printf("Listening on %s:%s\n", host, port);