*: Remove Crypto openSSL define from zebra.h

Only a couple of places use this.  Move these to a better
spot.

Signed-off-by: Donald Sharp <sharpd@nvidia.com>

diff --git a/isisd/isis_tlvs.c b/isisd/isis_tlvs.c
index ecf43faa7060ac36d15b5c906c38ef1935ef7fcf..2b0a58b73986bc9a8f4b13e49aed3ff9ca5da2b2 100644 (file)
--- a/isisd/isis_tlvs.c
+++ b/isisd/isis_tlvs.c
@@ -13,6 +13,11 @@
 #include <zebra.h>
 #include <json-c/json_object.h>
 
+#ifdef CRYPTO_OPENSSL
+#include <openssl/evp.h>
+#include <openssl/hmac.h>
+#endif
+
 #ifdef CRYPTO_INTERNAL
 #include "md5.h"
 #endif

diff --git a/lib/zebra.h b/lib/zebra.h
index fe8ac150a7bcc4c4a6d6d0170ec989b8b32d2e9b..076f51608c73218832c504929c74a0ec0e9b13dd 100644 (file)
--- a/lib/zebra.h
+++ b/lib/zebra.h
@@ -83,11 +83,6 @@
 #endif
 #endif
 
-#ifdef CRYPTO_OPENSSL
-#include <openssl/evp.h>
-#include <openssl/hmac.h>
-#endif
-
 #include "openbsd-tree.h"
 
 #include <netinet/in.h>

diff --git a/ospf6d/ospf6_auth_trailer.c b/ospf6d/ospf6_auth_trailer.c
index 10e00921f1c66d97e4e0152ee897e481b9e4cccd..82671eef77c6335c75c4038f5030d7941481adbc 100644 (file)
--- a/ospf6d/ospf6_auth_trailer.c
+++ b/ospf6d/ospf6_auth_trailer.c
@@ -4,6 +4,12 @@
  */
 
 #include "zebra.h"
+
+#ifdef CRYPTO_OPENSSL
+#include <openssl/evp.h>
+#include <openssl/hmac.h>
+#endif
+
 #include "config.h"
 #include "memory.h"
 #include "ospf6d.h"

diff --git a/ospfd/ospf_auth.c b/ospfd/ospf_auth.c
index 11ee1ddb18895508c6a38bbfc5e01a8212ec28df..74dc7d556ba415b0e947c81c34756f1222a47a05 100644 (file)
--- a/ospfd/ospf_auth.c
+++ b/ospfd/ospf_auth.c
@@ -6,6 +6,11 @@
 
 #include <zebra.h>
 
+#ifdef CRYPTO_OPENSSL
+#include <openssl/evp.h>
+#include <openssl/hmac.h>
+#endif
+
 #include "linklist.h"
 #include "if.h"
 #include "checksum.h"

diff --git a/ripd/ripd.c b/ripd/ripd.c
index a94dd96da0504115d0546418267f0c3dce37e8e9..d5df16c3a9763756576d70326b22d4214c25a237 100644 (file)
--- a/ripd/ripd.c
+++ b/ripd/ripd.c
@@ -6,6 +6,11 @@
 
 #include <zebra.h>
 
+#ifdef CRYPTO_OPENSSL
+#include <openssl/evp.h>
+#include <openssl/hmac.h>
+#endif
+
 #include "vrf.h"
 #include "if.h"
 #include "command.h"