From 3880a8ed80a4b1e2c052bd62f328bba2f869d5ae Mon Sep 17 00:00:00 2001
From: Aris Adamantiadis <aris@0xbadc0de.be>
Date: Mon, 29 Dec 2014 16:06:33 +0100
Subject: Fix the dh.c build with libgcrypt

Fixes bug reported by gentoo at https://bugs.gentoo.org/show_bug.cgi?id=533424
The function was only used by EDCSA backend which are not supported by the libgcrypt code anyway.
---
 src/dh.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/dh.c b/src/dh.c
index 84355d48..010a1dda 100644
--- a/src/dh.c
+++ b/src/dh.c
@@ -407,14 +407,17 @@ bignum make_string_bn(ssh_string string){
   return bn;
 }
 
+#ifdef HAVE_LIBCRYPTO
+/** @internal
+ * @brief converts the content of a SSH string in an already allocated bignum
+ * @warning only available with OpenSSL builds
+ */
 void make_string_bn_inplace(ssh_string string, bignum bnout) {
   unsigned int len = ssh_string_len(string);
-#ifdef HAVE_LIBGCRYPT
-  #error "unsupported"
-#elif defined HAVE_LIBCRYPTO
   bignum_bin2bn(string->data, len, bnout);
-#endif
 }
+#endif /* HAVE_LIBCRYPTO */
+
 
 ssh_string dh_get_e(ssh_session session) {
   return make_bignum_string(session->next_crypto->e);
-- 
cgit