X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fopenssl%2Frsagen.c;h=79127f68ed45b0249bee043e975c40f7db205d40;hb=1c475ecb575367a6b3f9328b0f643ad636155341;hp=4a47619e69fc8ca3e54f13f0ef1cb5091f757470;hpb=323c17e232539f3f06e7cebc664ab48f60127e0e;p=tinc

diff --git a/src/openssl/rsagen.c b/src/openssl/rsagen.c
index 4a47619e..79127f68 100644
--- a/src/openssl/rsagen.c
+++ b/src/openssl/rsagen.c
@@ -22,45 +22,49 @@
 #include <openssl/pem.h>
 #include <openssl/err.h>
 
-#define __TINC_RSA_INTERNAL__
+#define TINC_RSA_INTERNAL
 typedef RSA rsa_t;
 
 #include "../logger.h"
 #include "../rsagen.h"
+#include "../xalloc.h"
 
 /* This function prettyprints the key generation process */
 
 static int indicator(int a, int b, BN_GENCB *cb) {
-	switch (a) {
-		case 0:
-			fprintf(stderr, ".");
-			break;
+	(void)cb;
 
-		case 1:
-			fprintf(stderr, "+");
-			break;
+	switch(a) {
+	case 0:
+		fprintf(stderr, ".");
+		break;
 
-		case 2:
-			fprintf(stderr, "-");
-			break;
+	case 1:
+		fprintf(stderr, "+");
+		break;
 
-		case 3:
-			switch (b) {
-				case 0:
-					fprintf(stderr, " p\n");
-					break;
+	case 2:
+		fprintf(stderr, "-");
+		break;
 
-				case 1:
-					fprintf(stderr, " q\n");
-					break;
+	case 3:
+		switch(b) {
+		case 0:
+			fprintf(stderr, " p\n");
+			break;
 
-				default:
-					fprintf(stderr, "?");
-			}
+		case 1:
+			fprintf(stderr, " q\n");
 			break;
 
 		default:
 			fprintf(stderr, "?");
+		}
+
+		break;
+
+	default:
+		fprintf(stderr, "?");
 	}
 
 	return 1;
@@ -83,17 +87,24 @@ rsa_t *rsa_generate(size_t bits, unsigned long exponent) {
 	rsa_t *rsa = RSA_new();
 	BN_GENCB *cb = BN_GENCB_new();
 
-	if(!bn_e || !rsa || !cb)
+	if(!bn_e || !rsa || !cb) {
 		abort();
+	}
 
 	BN_set_word(bn_e, exponent);
 	BN_GENCB_set(cb, indicator, NULL);
 
-	RSA_generate_key_ex(rsa, bits, bn_e, cb);
+	int result = RSA_generate_key_ex(rsa, bits, bn_e, cb);
 
 	BN_GENCB_free(cb);
 	BN_free(bn_e);
 
+	if(!result) {
+		fprintf(stderr, "Error during key generation!\n");
+		RSA_free(rsa);
+		return NULL;
+	}
+
 	return rsa;
 }