1
1

cmake: Do not build internal ed25519 when unnecessary

Signed-off-by: Anderson Toshiyuki Sasaki <ansasaki@redhat.com>
Reviewed-by: Jakub Jelen <jjelen@redhat.com>
Этот коммит содержится в:
Anderson Toshiyuki Sasaki 2019-08-29 18:31:48 +02:00
родитель d463f67aba
Коммит 61e6b6cc59

Просмотреть файл

@ -156,11 +156,7 @@ set(libssh_SRCS
external/bcrypt_pbkdf.c external/bcrypt_pbkdf.c
external/blowfish.c external/blowfish.c
external/chacha.c external/chacha.c
external/ed25519.c
external/fe25519.c
external/ge25519.c
external/poly1305.c external/poly1305.c
external/sc25519.c
chachapoly.c chachapoly.c
config_parser.c config_parser.c
token.c token.c
@ -202,6 +198,10 @@ if (WITH_GCRYPT)
ecdh_gcrypt.c ecdh_gcrypt.c
dh_key.c dh_key.c
pki_ed25519.c pki_ed25519.c
external/ed25519.c
external/fe25519.c
external/ge25519.c
external/sc25519.c
) )
elseif (WITH_MBEDTLS) elseif (WITH_MBEDTLS)
set(libssh_SRCS set(libssh_SRCS
@ -213,6 +213,10 @@ elseif (WITH_MBEDTLS)
ecdh_mbedcrypto.c ecdh_mbedcrypto.c
dh_key.c dh_key.c
pki_ed25519.c pki_ed25519.c
external/ed25519.c
external/fe25519.c
external/ge25519.c
external/sc25519.c
) )
else (WITH_GCRYPT) else (WITH_GCRYPT)
set(libssh_SRCS set(libssh_SRCS
@ -227,6 +231,10 @@ else (WITH_GCRYPT)
set(libssh_SRCS set(libssh_SRCS
${libssh_SRCS} ${libssh_SRCS}
pki_ed25519.c pki_ed25519.c
external/ed25519.c
external/fe25519.c
external/ge25519.c
external/sc25519.c
) )
endif (NOT HAVE_OPENSSL_ED25519) endif (NOT HAVE_OPENSSL_ED25519)
if(OPENSSL_VERSION VERSION_LESS "1.1.0") if(OPENSSL_VERSION VERSION_LESS "1.1.0")
@ -279,10 +287,12 @@ if (WITH_GSSAPI AND GSSAPI_FOUND)
endif (WITH_GSSAPI AND GSSAPI_FOUND) endif (WITH_GSSAPI AND GSSAPI_FOUND)
if (NOT WITH_NACL) if (NOT WITH_NACL)
set(libssh_SRCS if (NOT HAVE_OPENSSL_ED25519)
${libssh_SRCS} set(libssh_SRCS
external/curve25519_ref.c ${libssh_SRCS}
) external/curve25519_ref.c
)
endif (NOT HAVE_OPENSSL_ED25519)
endif (NOT WITH_NACL) endif (NOT WITH_NACL)
include_directories( include_directories(