[Git][NTPsec/ntpsec][master] No need for openssl/err.h since we don't use any ERR_* functions

[Matt Selsky]

Matt Selsky pushed to branch master at NTPsec / ntpsec


Commits:
7c471992 by Matt Selsky at 2017-01-31T00:33:07-05:00
No need for openssl/err.h since we don't use any ERR_* functions

- - - - -


4 changed files:

- libntp/ssl_init.c
- tests/libntp/authkeys.c
- tests/libntp/macencrypt.c
- wafhelpers/check_openssl.py


Changes:

=====================================
libntp/ssl_init.c
=====================================
--- a/libntp/ssl_init.c
+++ b/libntp/ssl_init.c
@@ -12,7 +12,6 @@
 #include <ntp.h>
 #include <ntp_debug.h>
 
-#include <openssl/err.h>
 #include <openssl/evp.h>
 
 void	atexit_ssl_cleanup(void);
@@ -27,7 +26,6 @@ ssl_init(void)
 
 	init_lib();
 
-	ERR_load_crypto_strings();
 	OpenSSL_add_all_digests();
 	atexit(&atexit_ssl_cleanup);
 
@@ -43,5 +41,4 @@ atexit_ssl_cleanup(void)
 
 	ssl_init_done = false;
 	EVP_cleanup();
-	ERR_free_strings();
 }


=====================================
tests/libntp/authkeys.c
=====================================
--- a/tests/libntp/authkeys.c
+++ b/tests/libntp/authkeys.c
@@ -4,8 +4,6 @@
 #include "unity.h"
 #include "unity_fixture.h"
 
-
-#include <openssl/err.h>
 #include <openssl/evp.h>
 
 #include "ntp.h"


=====================================
tests/libntp/macencrypt.c
=====================================
--- a/tests/libntp/macencrypt.c
+++ b/tests/libntp/macencrypt.c
@@ -10,8 +10,6 @@ TEST_SETUP(macencrypt) {}
 
 TEST_TEAR_DOWN(macencrypt) {}
 
-
-#include <openssl/err.h>
 #include <openssl/evp.h>
 
 #include "ntp.h"


=====================================
wafhelpers/check_openssl.py
=====================================
--- a/wafhelpers/check_openssl.py
+++ b/wafhelpers/check_openssl.py
@@ -5,7 +5,6 @@ int main(void) {
 #if OPENSSL_VERSION_NUMBER < 0x0090704fL
 #error OpenSSL is too old.
 #endif
-    ERR_load_BIO_strings();
     OpenSSL_add_all_digests();
     return 0;
 }
@@ -18,7 +17,6 @@ def configure_openssl(ctx):
     OPENSSL_LIB = True
 
     headers = (
-        "openssl/err.h",
         "openssl/evp.h",
         "openssl/rand.h",
         "openssl/objects.h",



View it on GitLab: https://gitlab.com/NTPsec/ntpsec/commit/7c471992929af34de6fd7a5abd2dd0fe3d43598c
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.ntpsec.org/pipermail/vc/attachments/20170131/dc33dbfc/attachment.html>