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

diff --git a/src/openssl/rsagen.c b/src/openssl/rsagen.c
index c8546971..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-2013 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
@@ -17,7 +17,7 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#include "../system.h"
+#include "system.h"
 
 #include <openssl/pem.h>
 #include <openssl/err.h>
@@ -27,11 +27,12 @@ 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) {
+	(void)cb;
+
 	switch(a) {
 	case 0:
 		fprintf(stderr, ".");
@@ -70,16 +71,6 @@ 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();
@@ -92,7 +83,7 @@ rsa_t *rsa_generate(size_t bits, unsigned long exponent) {
 	BN_set_word(bn_e, exponent);
 	BN_GENCB_set(cb, indicator, NULL);
 
-	int result = RSA_generate_key_ex(rsa, bits, bn_e, cb);
+	int result = RSA_generate_key_ex(rsa, (int) bits, bn_e, cb);
 
 	BN_GENCB_free(cb);
 	BN_free(bn_e);