From d28f33228635e78dac8f9e9bcaec92690f2ca10a Mon Sep 17 00:00:00 2001
From: Guus Sliepen <guus@sliepen.org>
Date: Thu, 1 Jan 2015 00:52:39 +0100
Subject: [PATCH] Fixes for bugs in src/Makefile.am and tincctl.c introduced by
 cfe9285adf391ab66faeb5def811fe08e47a221a.

---
 src/Makefile.am | 4 +++-
 src/tincctl.c   | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index 5c8a8416..52f38e48 100644
--- 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 0eb3a256..ba536197 100644
--- 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
 
-- 
2.20.1