X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fopenssl%2Frsagen.c;h=78a22d92b391d56939fd7ca9295051e290ac0290;hb=5822f817aa802c2c5a83e9d99a8ae78cb822799b;hp=0f4a4fa19733f37cbfcd7e394f2e77d6ea51af33;hpb=103543aa2c15d9f1e2aa313a2e593a7524cce484;p=tinc

diff --git a/src/openssl/rsagen.c b/src/openssl/rsagen.c
index 0f4a4fa1..78a22d92 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-2013 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
@@ -17,17 +17,21 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#include "system.h"
+#include "../system.h"
 
 #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"
+#include "../xalloc.h"
 
 /* This function prettyprints the key generation process */
 
-static void indicator(int a, int b, void *p) {
+static int indicator(int a, int b, BN_GENCB *cb) {
 	switch (a) {
 		case 0:
 			fprintf(stderr, ".");
@@ -59,25 +63,53 @@ static void indicator(int a, int b, void *p) {
 		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);
+#ifndef HAVE_BN_GENCB_NEW
+BN_GENCB *BN_GENCB_new(void) {
+	return xzalloc(sizeof(BN_GENCB));
+}
 
-	return *rsa;
+void BN_GENCB_free(BN_GENCB *cb) {
+	free(cb);
+}
+#endif
+
+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);
+
+	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;
 }
 
 // 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);
 }