upstream: fixes for !WITH_OPENSSL compilation; ok dtucker@

OpenBSD-Commit-ID: 7fd68eaa9e0f7482b5d4c7e8d740aed4770a839f

1 files changed, 13 insertions, 1 deletions

diff --git a/kex.h b/kex.h
index 613904b6c..6465df88d 100644
--- a/kex.h
+++ b/kex.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: kex.h,v 1.108 2019/09/06 03:30:42 djm Exp $ */
+/* $OpenBSD: kex.h,v 1.109 2019/09/06 05:23:55 djm Exp $ */
 
 /*
  * Copyright (c) 2000, 2001 Markus Friedl.  All rights reserved.
@@ -45,6 +45,18 @@
 # 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"