From: Guus Sliepen <guus@tinc-vpn.org>
Date: Fri, 24 Apr 2015 21:43:19 +0000 (+0200)
Subject: Fix a possible segmentation fault during key upgrades.
X-Git-Tag: release-1.1pre12~182
X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=commitdiff_plain;h=ea1e815223e99f3747f94cf0d10eb06e52f70b21

Fix a possible segmentation fault during key upgrades.

read_rsa_public_key() was bailing out early if the given node already has an Ed25519 key, and
returned true even though c->rsa was NULL. The early bailout code isn't necessary anymore, so just
remove it.
---

diff --git a/src/net_setup.c b/src/net_setup.c
index c4f01b56..3c66c136 100644
--- a/src/net_setup.c
+++ b/src/net_setup.c
@@ -148,9 +148,6 @@ bool read_ecdsa_public_key(connection_t *c) {
 
 #ifndef DISABLE_LEGACY
 bool read_rsa_public_key(connection_t *c) {
-	if(ecdsa_active(c->ecdsa))
-		return true;
-
 	FILE *fp;
 	char *fname;
 	char *n;