Fix `make distcheck`

[tinc] / src / openssl / rsagen.c

diff --git a/src/openssl/rsagen.c b/src/openssl/rsagen.c
index cdd07f7..3674057 100644 (file)
--- 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
@@ -22,7 +22,7 @@
 #include <openssl/pem.h>
 #include <openssl/err.h>
 
-#define __TINC_RSA_INTERNAL__
+#define TINC_RSA_INTERNAL
 typedef RSA rsa_t;
 
 #include "../logger.h"
@@ -31,36 +31,39 @@ typedef RSA rsa_t;
 /* 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;
@@ -68,28 +71,19 @@ 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);
 
-       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);