summaryrefslogtreecommitdiff
path: root/kex.h
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2019-10-02 10:54:28 +1000
committerDamien Miller <djm@mindrot.org>2019-10-02 10:54:28 +1000
commitedd1d3a6261aecbf9a55944fd7be1db83571b46e (patch)
treebebd81104eda00c6b432ecb50122fb007338fc1b /kex.h
parent13c508dfed9f25e6e54c984ad00a74ef08539e70 (diff)
downloadopenssh-git-edd1d3a6261aecbf9a55944fd7be1db83571b46e.tar.gz
remove duplicate #includes
Prompted by Jakub Jelen
Diffstat (limited to 'kex.h')
-rw-r--r--kex.h15
1 files changed, 3 insertions, 12 deletions
diff --git a/kex.h b/kex.h
index 6465df88..a5ae6ac0 100644
--- a/kex.h
+++ b/kex.h
@@ -30,6 +30,9 @@
#include "crypto_api.h"
#ifdef WITH_OPENSSL
+# include <openssl/bn.h>
+# include <openssl/dh.h>
+# include <openssl/ecdsa.h>
# ifdef OPENSSL_HAS_ECC
# include <openssl/ec.h>
# else /* OPENSSL_HAS_ECC */
@@ -45,18 +48,6 @@
# define EC_POINT void
#endif /* WITH_OPENSSL */
-#ifdef WITH_OPENSSL
-#include <openssl/bn.h>
-#include <openssl/dh.h>
-#include <openssl/ec.h>
-#include <openssl/ecdsa.h>
-#else /* OPENSSL */
-#define BIGNUM void
-#define DH void
-#define EC_KEY void
-#define EC_GROUP void
-#endif /* WITH_OPENSSL */
-
#define KEX_COOKIE_LEN 16
#define KEX_DH1 "diffie-hellman-group1-sha1"