diff options
| author | Donald Sharp <sharpd@nvidia.com> | 2024-01-04 14:02:34 -0500 |
|---|---|---|
| committer | Donald Sharp <sharpd@nvidia.com> | 2024-01-04 14:02:34 -0500 |
| commit | 2bf051a5770c22c61220c7f169432c93c0da612a (patch) | |
| tree | d820dedac54e8c79f1edfaf1dc5f9bb8ba10f441 | |
| parent | 10387101fecf4956db38945655aa291aec63d9f7 (diff) | |
*: 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>
| -rw-r--r-- | isisd/isis_tlvs.c | 5 | ||||
| -rw-r--r-- | lib/zebra.h | 5 | ||||
| -rw-r--r-- | ospf6d/ospf6_auth_trailer.c | 6 | ||||
| -rw-r--r-- | ospfd/ospf_auth.c | 5 | ||||
| -rw-r--r-- | ripd/ripd.c | 5 |
5 files changed, 21 insertions, 5 deletions
diff --git a/isisd/isis_tlvs.c b/isisd/isis_tlvs.c index ecf43faa70..2b0a58b739 100644 --- 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 fe8ac150a7..076f51608c 100644 --- 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 10e00921f1..82671eef77 100644 --- 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 11ee1ddb18..74dc7d556b 100644 --- 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 a94dd96da0..d5df16c3a9 100644 --- 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" |
