Merge pull request #8 from jwendell/MAISTRA-1275

MAISTRA-1275: Write "OpenSSL" into envoy --version
maistra · Mar 16, 2020 · 09d777a · 09d777a
2 parents 6110125 + 362b623
commit 09d777a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/source/common/common/BUILD b/source/common/common/BUILD
@@ -320,6 +320,7 @@ envoy_cc_library(
         # This is done so that the definitions linked via the linkstamp rule don't cause collisions.
         "//conditions:default": [":generate_version_linkstamp_empty"],
     }),
+    copts = ["-DENVOY_SSL_VERSION=\\\"OpenSSL_1.1.1d\\\""],
     linkstamp = "version_linkstamp.cc",
     strip_include_prefix = select({
         "//bazel:manual_stamp": "lib",

diff --git a/source/common/common/version.cc b/source/common/common/version.cc
@@ -27,7 +27,7 @@ const std::string& VersionInfo::version() {
                                                   "DEBUG",
 #endif
 #ifdef ENVOY_SSL_VERSION
-                                                  "OpenSSL_1_1_1-ed8447bbc862a76c380bdcbc3699840b7338feb1"
+                                                  ENVOY_SSL_VERSION
 #else
                                                   "no-ssl"
 #endif