X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fopenssl%2Frsagen.c;h=3dd34e23e1710f93db97009fa273e9a72ff0b1cf;hb=1545909dcb3ac618754486f4ccd4d8f237d64bb7;hp=b7eb6299a05b3d854fec20f4bc15d81137240606;hpb=b1c29464b68d756035acc4b4d1681f05d8831eaf;p=tinc

diff --git a/src/openssl/rsagen.c b/src/openssl/rsagen.c
index b7eb6299..3dd34e23 100644
--- a/src/openssl/rsagen.c
+++ b/src/openssl/rsagen.c
@@ -17,51 +17,51 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#include "../system.h"
-
 #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;
@@ -69,23 +69,14 @@ static int indicator(int a, int b, BN_GENCB *cb) {
 
 // Generate RSA key
 
-#ifndef HAVE_BN_GENCB_NEW
-BN_GENCB *BN_GENCB_new(void) {
-	return xzalloc(sizeof(BN_GENCB));
-}
-
-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)
+	if(!bn_e || !rsa || !cb) {
 		abort();
+	}
 
 	BN_set_word(bn_e, exponent);
 	BN_GENCB_set(cb, indicator, NULL);