X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fopenssl%2Frsagen.c;h=ce0bd0bf42b4b7578c7cc3ce1db3bdd7e14bcb03;hb=28b7a53b693f6b4e70218a926e68a36ece54cda1;hp=689e8a6a8f3ea02de24130845aeda6c3d0520c58;hpb=08aabbf9317806bc50a9a6693ca866c8936ce26b;p=tinc

diff --git a/src/openssl/rsagen.c b/src/openssl/rsagen.c
index 689e8a6a..ce0bd0bf 100644
--- a/src/openssl/rsagen.c
+++ b/src/openssl/rsagen.c
@@ -1,6 +1,6 @@
 /*
     rsagen.c -- RSA key generation and export
-    Copyright (C) 2008 Guus Sliepen <guus@tinc-vpn.org>
+    Copyright (C) 2008-2022 Guus Sliepen <guus@tinc-vpn.org>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -12,11 +12,9 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-    $Id$
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
 #include "system.h"
@@ -24,62 +22,87 @@
 #include <openssl/pem.h>
 #include <openssl/err.h>
 
-#include "logger.h"
-#include "rsagen.h"
+#define TINC_RSA_INTERNAL
+typedef RSA rsa_t;
+
+#include "../logger.h"
+#include "../rsagen.h"
 
 /* This function prettyprints the key generation process */
 
-static void indicator(int a, int b, void *p) {
-	switch (a) {
-		case 0:
-			fprintf(stderr, ".");
-			break;
+static int indicator(int a, int b, BN_GENCB *cb) {
+	(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;
 }
 
 // Generate RSA key
 
-bool rsa_generate(rsa_t *rsa, size_t bits, unsigned long exponent) {
-	*rsa = RSA_generate_key(bits, exponent, indicator, NULL);
+rsa_t *rsa_generate(size_t bits, unsigned long exponent) {
+	BIGNUM *bn_e = BN_new();
+	rsa_t *rsa = RSA_new();
+	BN_GENCB *cb = BN_GENCB_new();
+
+	if(!bn_e || !rsa || !cb) {
+		abort();
+	}
+
+	BN_set_word(bn_e, exponent);
+	BN_GENCB_set(cb, indicator, NULL);
 
-	return *rsa;
+	int result = RSA_generate_key_ex(rsa, (int) 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;
 }
 
 // Write PEM RSA keys
 
 bool rsa_write_pem_public_key(rsa_t *rsa, FILE *fp) {
-	PEM_write_RSAPublicKey(fp, *rsa);
-
-	return true;
+	return PEM_write_RSAPublicKey(fp, rsa);
 }
 
 bool rsa_write_pem_private_key(rsa_t *rsa, FILE *fp) {
-	PEM_write_RSAPrivateKey(fp, *rsa, NULL, NULL, 0, NULL, NULL);
-	return true;
+	return PEM_write_RSAPrivateKey(fp, rsa, NULL, NULL, 0, NULL, NULL);
 }