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"
/* 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
rsa_t *rsa_generate(size_t bits, unsigned long exponent) {
- return RSA_generate_key(bits, exponent, indicator, NULL);
+ 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