diff options
| author | Alexander Færøy <ahf@torproject.org> | 2021-11-08 14:15:56 +0000 |
|---|---|---|
| committer | Alexander Færøy <ahf@torproject.org> | 2021-11-08 14:15:56 +0000 |
| commit | 4914e0e1ccc9ce52ce6c96c53925a5e64f7c6ff6 (patch) | |
| tree | 4649999a98fd77313e016b006e2ebd06947935ca | |
| parent | 439e17180c362962abfdf2301dddbdaa323df24a (diff) | |
| parent | 8beb560bfd19106ab75e13f6bf6230fde93e5fac (diff) | |
| download | tor-4914e0e1ccc9ce52ce6c96c53925a5e64f7c6ff6.tar.gz tor-4914e0e1ccc9ce52ce6c96c53925a5e64f7c6ff6.zip | |
Merge remote-tracking branch 'tor-gitlab/mr/486' into maint-0.3.5
| -rw-r--r-- | changes/bug40429 | 5 | ||||
| -rw-r--r-- | configure.ac | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/changes/bug40429 b/changes/bug40429 new file mode 100644 index 0000000000..9bf3b63818 --- /dev/null +++ b/changes/bug40429 @@ -0,0 +1,5 @@ + o Minor bugfixes (compilation): + - Fix our configuration logic to detect whether we had OpenSSL 3: + previously, our logic was reversed. This has no other effect than to + change whether we suppress deprecated API warnings. Fixes + bug 40429; bugfix on 0.3.5.13. diff --git a/configure.ac b/configure.ac index 930862442c..249a250a2f 100644 --- a/configure.ac +++ b/configure.ac @@ -945,7 +945,7 @@ dnl warnings. AC_MSG_CHECKING([for OpenSSL >= 3.0.0]) AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ #include <openssl/opensslv.h> -#if !defined(LIBRESSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER <= 0x30000000L +#if !defined(LIBRESSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x30000000L #error "you_have_version_3" #endif ]], [[]])], |