From: Guus Sliepen <guus@tinc-vpn.org>
Date: Wed, 26 Feb 2014 16:27:57 +0000 (+0100)
Subject: Rewind the file before trying to use PEM_read_RSA_PUBKEY().
X-Git-Tag: release-1.1pre11~129
X-Git-Url: https://tinc-vpn.org/git/browse?a=commitdiff_plain;h=09e000ba54fd4a4ffe3e5c15ee7aeadac35d6996;p=tinc

Rewind the file before trying to use PEM_read_RSA_PUBKEY().
---

diff --git a/src/openssl/rsa.c b/src/openssl/rsa.c
index 20bfb65a..9c1f4984 100644
--- a/src/openssl/rsa.c
+++ b/src/openssl/rsa.c
@@ -61,8 +61,10 @@ rsa_t *rsa_set_hex_private_key(char *n, char *e, char *d) {
 rsa_t *rsa_read_pem_public_key(FILE *fp) {
 	rsa_t *rsa = PEM_read_RSAPublicKey(fp, NULL, NULL, NULL);
 
-	if(!rsa)
+	if(!rsa) {
+		rewind(fp);
 		rsa = PEM_read_RSA_PUBKEY(fp, NULL, NULL, NULL);
+	}
 
 	if(!rsa)
 		logger(DEBUG_ALWAYS, LOG_ERR, "Unable to read RSA public key: %s", ERR_error_string(ERR_get_error(), NULL));