[njs] SSL: fixed reporting of the detected library version.

Dmitry Volyntsev xeioex at nginx.com
Wed Nov 17 17:01:50 UTC 2021


details:   https://hg.nginx.org/njs/rev/a2d200d79c58
branches:  
changeset: 1747:a2d200d79c58
user:      Dmitry Volyntsev <xeioex at nginx.com>
date:      Wed Nov 17 17:01:07 2021 +0000
description:
SSL: fixed reporting of the detected library version.

Previously, `openssl version` command was used to report the OpenSSL
version.  Whereas, when provided with custom CFLAGS and LDFLAGS the
used library may differ from the system one.

The fix is to report OpenSSL version using the provided library.

diffstat:

 auto/openssl |  11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)

diffs (21 lines):

diff -r fd40eb687bc7 -r a2d200d79c58 auto/openssl
--- a/auto/openssl	Wed Nov 17 14:11:28 2021 +0000
+++ b/auto/openssl	Wed Nov 17 17:01:07 2021 +0000
@@ -25,7 +25,16 @@ njs_feature_test="#include <openssl/evp.
 
 
 if [ $njs_found = yes ]; then
-    echo " + OpenSSL version: `openssl version`"
+    njs_feature="OpenSSL version"
+    njs_feature_name=NJS_OPENSSL_VERSION
+    njs_feature_run=value
+    njs_feature_test="#include <openssl/ssl.h>
+
+                      int main() {
+                          printf(\"\\\"%s\\\"\", OPENSSL_VERSION_TEXT);
+                          return 0;
+                      }"
+    . auto/feature
 
     NJS_HAVE_OPENSSL=YES
     NJS_OPENSSL_LIB="$njs_feature_libs"


More information about the nginx-devel mailing list