From 7c28d0ce6d38a4e99e981fc3abf380e4cf29a57e Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@cryptomilk.org>
Date: Sun, 28 Aug 2011 14:29:17 +0200
Subject: pki: Compile pki_gcrypt.c only if we need it.

---
 src/CMakeLists.txt |  2 +-
 src/pki_gcrypt.c   | 30 +-----------------------------
 2 files changed, 2 insertions(+), 30 deletions(-)

(limited to 'src')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 392944a..79b6953 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -103,7 +103,6 @@ set(libssh_SRCS
   packet.c
   pcap.c
   pki.c
-  pki_gcrypt.c
   poll.c
   session.c
   scp.c
@@ -118,6 +117,7 @@ if (WITH_GCRYPT)
         ${libssh_SRCS}
         libgcrypt.c
         gcrypt_missing.c
+        pki_gcrypt.c
        )
 else (WITH_GCRYPT)
     set(libssh_SRCS
diff --git a/src/pki_gcrypt.c b/src/pki_gcrypt.c
index 1e3f1ef..ded5038 100644
--- a/src/pki_gcrypt.c
+++ b/src/pki_gcrypt.c
@@ -31,22 +31,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
-
-#ifdef _WIN32
-# if _MSC_VER >= 1400
-#  include <io.h>
-#  undef open
-#  define open _open
-#  undef close
-#  define close _close
-#  undef read
-#  define read _read
-#  undef unlink
-#  define unlink _unlink
-# endif /* _MSC_VER */
-#else
-# include <arpa/inet.h>
-#endif
+#include <gcrypt.h>
 
 #include "libssh/priv.h"
 #include "libssh/buffer.h"
@@ -60,24 +45,12 @@
 /*todo: remove this include */
 #include "libssh/string.h"
 
-
-#ifdef HAVE_LIBGCRYPT
-#include <gcrypt.h>
-#elif defined HAVE_LIBCRYPTO
-#include <openssl/pem.h>
-#include <openssl/dsa.h>
-#include <openssl/err.h>
-#include <openssl/rsa.h>
-#endif /* HAVE_LIBCRYPTO */
-
 #define MAXLINESIZE 80
 #define RSA_HEADER_BEGIN "-----BEGIN RSA PRIVATE KEY-----"
 #define RSA_HEADER_END "-----END RSA PRIVATE KEY-----"
 #define DSA_HEADER_BEGIN "-----BEGIN DSA PRIVATE KEY-----"
 #define DSA_HEADER_END "-----END DSA PRIVATE KEY-----"
 
-#ifdef HAVE_LIBGCRYPT
-
 #define MAX_KEY_SIZE 32
 #define MAX_PASSPHRASE_SIZE 1024
 #define ASN1_INTEGER 2
@@ -1521,6 +1494,5 @@ ssh_signature pki_do_sign_sessionid(const ssh_key key,
     return sig;
 }
 #endif /* WITH_SERVER */
-#endif /* HAVE_LIBGCRYPT */
 
 /* vim: set ts=4 sw=4 et cindent: */
-- 
cgit