lib/libssh
1
0
Fork 0
mirror of https://git.libssh.org/projects/libssh.git synced 2025-11-30 13:01:23 +03:00
Code Activity

Do not build in internal chacha implementation if gcrypt supports that

Browse Source 
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
This commit is contained in:
Jakub Jelen
2020-01-15 11:03:52 +01:00
parent 8670fb101b
commit 94fe7634e1
1 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/CMakeLists.txt
View File

@@ -135,9 +135,6 @@ set(libssh_SRCS
wrapper.c wrapper.c
external/bcrypt_pbkdf.c external/bcrypt_pbkdf.c
external/blowfish.c external/blowfish.c
external/chacha.c
external/poly1305.c
chachapoly.c
config_parser.c config_parser.c
token.c token.c
pki_ed25519_common.c pki_ed25519_common.c
@@ -183,6 +180,14 @@ if (WITH_GCRYPT)
external/ge25519.c external/ge25519.c
external/sc25519.c external/sc25519.c
) )
if (NOT HAVE_GCRYPT_CHACHA_POLY)
set(libssh_SRCS
${libssh_SRCS}
external/chacha.c
external/poly1305.c
chachapoly.c
)
endif (NOT HAVE_GCRYPT_CHACHA_POLY)
elseif (WITH_MBEDTLS) elseif (WITH_MBEDTLS)
set(libssh_SRCS set(libssh_SRCS
${libssh_SRCS} ${libssh_SRCS}
@@ -197,6 +202,9 @@ elseif (WITH_MBEDTLS)
external/fe25519.c external/fe25519.c
external/ge25519.c external/ge25519.c
external/sc25519.c external/sc25519.c
external/chacha.c
external/poly1305.c
chachapoly.c
) )
else (WITH_GCRYPT) else (WITH_GCRYPT)
set(libssh_SRCS set(libssh_SRCS
@@ -206,6 +214,9 @@ else (WITH_GCRYPT)
ecdh_crypto.c ecdh_crypto.c
libcrypto.c libcrypto.c
dh_crypto.c dh_crypto.c
external/chacha.c
external/poly1305.c
chachapoly.c
) )
if (NOT HAVE_OPENSSL_ED25519) if (NOT HAVE_OPENSSL_ED25519)
set(libssh_SRCS set(libssh_SRCS