Fixes for bugs in src/Makefile.am and tincctl.c introduced by cfe9285adf
.
This commit is contained in:
parent
4d50f9f348
commit
d28f332286
2 changed files with 4 additions and 2 deletions
|
@ -203,7 +203,8 @@ sptps_speed_SOURCES += \
|
||||||
openssl/crypto.c \
|
openssl/crypto.c \
|
||||||
openssl/digest.c openssl/digest.h \
|
openssl/digest.c openssl/digest.h \
|
||||||
openssl/prf.c
|
openssl/prf.c
|
||||||
elif GCRYPT
|
else
|
||||||
|
if GCRYPT
|
||||||
tincd_SOURCES += \
|
tincd_SOURCES += \
|
||||||
gcrypt/cipher.c \
|
gcrypt/cipher.c \
|
||||||
gcrypt/crypto.c \
|
gcrypt/crypto.c \
|
||||||
|
@ -244,6 +245,7 @@ sptps_speed_SOURCES += \
|
||||||
nolegacy/crypto.c \
|
nolegacy/crypto.c \
|
||||||
nolegacy/prf.c
|
nolegacy/prf.c
|
||||||
endif
|
endif
|
||||||
|
endif
|
||||||
|
|
||||||
tinc_LDADD = $(READLINE_LIBS) $(CURSES_LIBS)
|
tinc_LDADD = $(READLINE_LIBS) $(CURSES_LIBS)
|
||||||
sptps_speed_LDADD = -lrt
|
sptps_speed_LDADD = -lrt
|
||||||
|
|
|
@ -1848,7 +1848,7 @@ static int cmd_generate_keys(int argc, char *argv[]) {
|
||||||
name = get_my_name(false);
|
name = get_my_name(false);
|
||||||
|
|
||||||
#ifndef DISABLE_LEGACY
|
#ifndef DISABLE_LEGACY
|
||||||
if(!rsa_keygen(argc > 1 ? atoi(argv[1]) : 2048, true)
|
if(!rsa_keygen(argc > 1 ? atoi(argv[1]) : 2048, true))
|
||||||
return 1;
|
return 1;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue