[Git][NTPsec/ntpsec][master] Remove dependency on specific version of OpenSSL

[Hal Murray]

Hal Murray pushed to branch master at NTPsec / ntpsec


Commits:
6d17955b by Matt Selsky at 2018-03-07T16:42:03Z
Remove dependency on specific version of OpenSSL

The dependency on 0.9.7d was cargo-culted from https://github.com/openldap/openldap/commit/93cec8b6947816052b391d684f788c9e8c3fb452

Any version of OpenSSL should be fine for our purposes

Related to GitLab issue #463

- - - - -


1 changed file:

- wscript


Changes:

=====================================
wscript
=====================================
--- a/wscript
+++ b/wscript
@@ -594,22 +594,10 @@ int main(int argc, char **argv) {
     # Check via pkg-config first, then fall back to a direct search
     if not ctx.check_cfg(
         package='libcrypto', uselib_store='CRYPTO',
-        args=['libcrypto >= 0.9.7d', '--cflags', '--libs'],
-        msg="Checking for OpenSSL >= 0.9.7d (via pkg-config)",
+        args=['libcrypto', '--cflags', '--libs'],
+        msg="Checking for OpenSSL (via pkg-config)",
         define_name='', mandatory=False,
     ):
-        # Find OpenSSL. Must happen before function checks
-        # Versions older than 0.9.7d were deemed incompatible in NTP Classic.
-        SNIP_OPENSSL_VERSION_CHECK = """
-        #include <openssl/evp.h>
-        int main(void) {
-        #if OPENSSL_VERSION_NUMBER < 0x0090704fL
-        #error OpenSSL must be at least 0.9.7d
-        #endif
-            return 0;
-        }
-        """
-
         openssl_headers = (
             "openssl/evp.h",
             "openssl/rand.h",
@@ -618,12 +606,8 @@ int main(int argc, char **argv) {
         for hdr in openssl_headers:
             ctx.check_cc(header_name=hdr, includes=ctx.env.PLATFORM_INCLUDES)
         # FIXME! Ignoring the result...
-        ctx.check_cc(lib="crypto")
-        ctx.check_cc(comment="OpenSSL support",
-                     fragment=SNIP_OPENSSL_VERSION_CHECK,
-                     includes=ctx.env.PLATFORM_INCLUDES,
-                     msg="Checking for OpenSSL >= 0.9.7d",
-                     )
+        ctx.check_cc(msg="Checking for OpenSSL's crypto library",
+                     lib="crypto")
 
     # Optional functions.  Do all function checks here, otherwise
     # we're likely to duplicate them.



View it on GitLab: https://gitlab.com/NTPsec/ntpsec/commit/6d17955b03ca65d67f2cc2ceba01bd60e07d5fd4

---
View it on GitLab: https://gitlab.com/NTPsec/ntpsec/commit/6d17955b03ca65d67f2cc2ceba01bd60e07d5fd4
You're receiving this email because of your account on gitlab.com.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.ntpsec.org/pipermail/vc/attachments/20180308/cbd60b7a/attachment.html>