lib/libssh
1
0
Fork 0
mirror of https://git.libssh.org/projects/libssh.git synced 2025-08-08 19:02:06 +03:00
Code Activity

pki: Compile pki_gcrypt.c only if we need it.

Browse Source
This commit is contained in:
Andreas Schneider
2011-08-28 14:29:17 +02:00
parent 5cf23522de
commit 7c28d0ce6d
2 changed files with 2 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/CMakeLists.txt
View File

@@ -103,7 +103,6 @@ set(libssh_SRCS
packet.c packet.c
pcap.c pcap.c
pki.c pki.c
pki_gcrypt.c
poll.c poll.c
session.c session.c
scp.c scp.c
@@ -118,6 +117,7 @@ if (WITH_GCRYPT)
${libssh_SRCS} ${libssh_SRCS}
libgcrypt.c libgcrypt.c
gcrypt_missing.c gcrypt_missing.c
pki_gcrypt.c
) )
else (WITH_GCRYPT) else (WITH_GCRYPT)
set(libssh_SRCS set(libssh_SRCS

30
src/pki_gcrypt.c
View File

@@ -31,22 +31,7 @@
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>
#include <gcrypt.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 "libssh/priv.h" #include "libssh/priv.h"
#include "libssh/buffer.h" #include "libssh/buffer.h"
@@ -60,24 +45,12 @@
/*todo: remove this include */ /*todo: remove this include */
#include "libssh/string.h" #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 MAXLINESIZE 80
#define RSA_HEADER_BEGIN "-----BEGIN RSA PRIVATE KEY-----" #define RSA_HEADER_BEGIN "-----BEGIN RSA PRIVATE KEY-----"
#define RSA_HEADER_END "-----END RSA PRIVATE KEY-----" #define RSA_HEADER_END "-----END RSA PRIVATE KEY-----"
#define DSA_HEADER_BEGIN "-----BEGIN DSA PRIVATE KEY-----" #define DSA_HEADER_BEGIN "-----BEGIN DSA PRIVATE KEY-----"
#define DSA_HEADER_END "-----END DSA PRIVATE KEY-----" #define DSA_HEADER_END "-----END DSA PRIVATE KEY-----"
#ifdef HAVE_LIBGCRYPT
#define MAX_KEY_SIZE 32 #define MAX_KEY_SIZE 32
#define MAX_PASSPHRASE_SIZE 1024 #define MAX_PASSPHRASE_SIZE 1024
#define ASN1_INTEGER 2 #define ASN1_INTEGER 2
@@ -1521,6 +1494,5 @@ ssh_signature pki_do_sign_sessionid(const ssh_key key,
return sig; return sig;
} }
#endif /* WITH_SERVER */ #endif /* WITH_SERVER */
#endif /* HAVE_LIBGCRYPT */
/* vim: set ts=4 sw=4 et cindent: */ /* vim: set ts=4 sw=4 et cindent: */