[Git][NTPsec/ntpsec][master] Another try at fixing Issue #461

[Hal Murray]

Hal Murray pushed to branch master at NTPsec / ntpsec


Commits:
4c11ab3f by Hal Murray at 2018-02-28T15:24:10-08:00
Another try at fixing Issue #461

- - - - -


2 changed files:

- include/ntp_stdlib.h
- libntp/macencrypt.c


Changes:

=====================================
include/ntp_stdlib.h
=====================================
--- a/include/ntp_stdlib.h
+++ b/include/ntp_stdlib.h
@@ -10,7 +10,6 @@
 #include <signal.h>
 #include <errno.h>
 #include <stdarg.h>
-#include <openssl/evp.h>
 
 #include "declcond.h"	/* ntpd uses ntpd/declcond.h, others include/ */
 #include "ntp_net.h"
@@ -155,10 +154,6 @@ extern bool	ipv6_works;
 /* ssl_init.c */
 extern	void	ssl_init	(void);
 
-/* Avoid 2x create/destroy per packet.
- * need per thread if we start using threads. */
-EVP_MD_CTX *digest_ctx;
-
 /* strl-obsd.c */
 #ifndef HAVE_STRLCPY		/* + */
 /*


=====================================
libntp/macencrypt.c
=====================================
--- a/libntp/macencrypt.c
+++ b/libntp/macencrypt.c
@@ -20,6 +20,9 @@
 #define EVP_MD_CTX_reset(ctx) EVP_MD_CTX_init(ctx)
 #endif
 
+/* Need one per thread. */
+extern EVP_MD_CTX *digest_ctx;
+
 /* ctmemeq - test two blocks memory for equality without leaking
  * timing information.
  *



View it on GitLab: https://gitlab.com/NTPsec/ntpsec/commit/4c11ab3fe29927b2a7b2de642de4bd0909379c3b

---
View it on GitLab: https://gitlab.com/NTPsec/ntpsec/commit/4c11ab3fe29927b2a7b2de642de4bd0909379c3b
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/20180228/86c8c696/attachment.html>