Fixes for bugs in src/Makefile.am and tincctl.c introduced by cfe9285adf391ab66faeb5d...

diff --git a/src/Makefile.am b/src/Makefile.am
index 5c8a841..52f38e4 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -203,7 +203,8 @@ sptps_speed_SOURCES += \
        openssl/crypto.c \
        openssl/digest.c openssl/digest.h \
        openssl/prf.c
-elif GCRYPT
+else
+if GCRYPT
 tincd_SOURCES += \
        gcrypt/cipher.c \
        gcrypt/crypto.c \
@@ -244,6 +245,7 @@ sptps_speed_SOURCES += \
        nolegacy/crypto.c \
        nolegacy/prf.c
 endif
+endif
 
 tinc_LDADD = $(READLINE_LIBS) $(CURSES_LIBS)
 sptps_speed_LDADD = -lrt

diff --git a/src/tincctl.c b/src/tincctl.c
index 0eb3a25..ba53619 100644 (file)
--- a/src/tincctl.c
+++ b/src/tincctl.c
@@ -1848,7 +1848,7 @@ static int cmd_generate_keys(int argc, char *argv[]) {
                name = get_my_name(false);
 
 #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;
 #endif