"Randall S. Becker" <the.n.e.key@xxxxxxxxx> writes: > This change uses the OpenSSL supplied OPENSSL_VERSION_TEXT #define supplied > for this purpose by that project. If the #define is not present, the version > is not reported. > > Signed-off-by: Randall S. Becker <rsbecker@xxxxxxxxxxxxx> > --- > help.c | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/help.c b/help.c > index 1d057aa607..ce55aaa2c0 100644 > --- a/help.c > +++ b/help.c > @@ -757,6 +757,9 @@ void get_version_info(struct strbuf *buf, int show_build_options) > > if (fsmonitor_ipc__is_supported()) > strbuf_addstr(buf, "feature: fsmonitor--daemon\n"); > +#if defined OPENSSL_VERSION_TEXT > + strbuf_addf(buf, "OpenSSL: %s\n", OPENSSL_VERSION_TEXT); > +#endif > } > } It is kind-a surprising that we do not need to play with any Makefile macros for this implementation. If some unknown version (either in the long past or in the future) of OpenSSL does not define the constant, this is just compiled out and that would be OK. If some unknown version of OpenSSL does define it but not as a string constant, it would break the build, e.g., #define OPENSSL_VERSION_TEXT 2 plus 4 is 6 We could stringify it ourselves, but that is probably not worth worrying about. Will queue. Thanks.
