/*
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
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, ".");
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);
}