X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fgcrypt%2Frsa.c;h=04aa358d3029cf0829efe7c6b47fad0617cfc5f5;hb=76de8e3924fc36e5a3e906741bf640dceb846800;hp=83f177b8084e31c0c181bcfb9c5415a917b91c62;hpb=b39b69a2e4b20c8fb9c49af4156734437b42f910;p=tinc

diff --git a/src/gcrypt/rsa.c b/src/gcrypt/rsa.c
index 83f177b8..04aa358d 100644
--- a/src/gcrypt/rsa.c
+++ b/src/gcrypt/rsa.c
@@ -23,6 +23,7 @@
 
 #include "pem.h"
 
+#include "asn1.h"
 #include "rsa.h"
 #include "../logger.h"
 #include "../rsa.h"
@@ -84,20 +85,11 @@ static size_t ber_read_len(unsigned char **p, size_t *buflen) {
 	}
 }
 
-
-static bool ber_read_sequence(unsigned char **p, size_t *buflen, size_t *result) {
+static bool ber_skip_sequence(unsigned char **p, size_t *buflen) {
 	int tag = ber_read_id(p, buflen);
-	size_t len = ber_read_len(p, buflen);
-
-	if(tag == 0x10) {
-		if(result) {
-			*result = len;
-		}
 
-		return true;
-	} else {
-		return false;
-	}
+	return tag == TAG_SEQUENCE &&
+	       ber_read_len(p, buflen) > 0;
 }
 
 static bool ber_read_mpi(unsigned char **p, size_t *buflen, gcry_mpi_t *mpi) {
@@ -172,7 +164,7 @@ rsa_t *rsa_read_pem_public_key(FILE *fp) {
 
 	rsa_t *rsa = xzalloc(sizeof(rsa_t));
 
-	if(!ber_read_sequence(&derp, &derlen, NULL)
+	if(!ber_skip_sequence(&derp, &derlen)
 	                || !ber_read_mpi(&derp, &derlen, &rsa->n)
 	                || !ber_read_mpi(&derp, &derlen, &rsa->e)
 	                || derlen) {
@@ -195,7 +187,7 @@ rsa_t *rsa_read_pem_private_key(FILE *fp) {
 
 	rsa_t *rsa = xzalloc(sizeof(rsa_t));
 
-	if(!ber_read_sequence(&derp, &derlen, NULL)
+	if(!ber_skip_sequence(&derp, &derlen)
 	                || !ber_read_mpi(&derp, &derlen, NULL)
 	                || !ber_read_mpi(&derp, &derlen, &rsa->n)
 	                || !ber_read_mpi(&derp, &derlen, &rsa->e)