generic-library/ssh2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

removed conditional sources from Makefile.inc

Browse Source 
added ifdef blocks to libgcrypt.c, pem.c, openssl.c
This commit is contained in:
Guenter Knauf 2009-09-07 18:10:49 +02:00
parent 766127ad57
commit 7c32c84d0e
4 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile.inc
View File

@ -1,11 +1,5 @@
CSOURCES = channel.c comp.c crypt.c hostkey.c kex.c mac.c misc.c \
packet.c publickey.c scp.c session.c sftp.c userauth.c transport.c \
version.c knownhost.c
ifdef LIBGCRYPT
CSOURCES += libgcrypt.c pem.c
else
CSOURCES += openssl.c
endif
version.c knownhost.c openssl.c libgcrypt.c pem.c
HHEADERS = libssh2_priv.h openssl.h libgcrypt.h transport.h channel.h comp.h mac.h misc.h

5
src/libgcrypt.c
View File

@ -37,6 +37,9 @@
*/
#include "libssh2_priv.h"
#ifdef LIBSSH2_LIBGCRYPT /* compile only if we build with libgcrypt */
#include <string.h>
int
@ -572,3 +575,5 @@ _libssh2_cipher_crypt(_libssh2_cipher_ctx * ctx,
}
return ret;
}
#endif /* LIBSSH2_LIBGCRYPT */

5
src/openssl.c
View File

@ -37,6 +37,9 @@
*/
#include "libssh2_priv.h"
#ifndef LIBSSH2_LIBGCRYPT /* compile only if we build with OpenSSL */
#include <string.h>
#ifndef EVP_MAX_BLOCK_LENGTH
@ -337,3 +340,5 @@ _libssh2_dsa_sha1_sign(libssh2_dsa_ctx * dsactx,
return 0;
}
#endif /* !LIBSSH2_LIBGCRYPT */

4
src/pem.c
View File

@ -38,6 +38,8 @@
#include "libssh2_priv.h"
#ifdef LIBSSH2_LIBGCRYPT /* compile only if we build with libgcrypt */
static int
readline(char *line, int line_size, FILE * fp)
{
@ -207,3 +209,5 @@ _libssh2_pem_decode_integer(unsigned char **data, unsigned int *datalen,
return 0;
}
#endif /* LIBSSH2_LIBGCRYPT */