projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove unused '#include's.
[tinc]
/
src
/
openssl
/
rsagen.c
diff --git
a/src/openssl/rsagen.c
b/src/openssl/rsagen.c
index
4a47619
..
3dd34e2
100644
(file)
--- a/
src/openssl/rsagen.c
+++ b/
src/openssl/rsagen.c
@@
-17,12
+17,10
@@
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#include "../system.h"
-
#include <openssl/pem.h>
#include <openssl/err.h>
#include <openssl/pem.h>
#include <openssl/err.h>
-#define
__TINC_RSA_INTERNAL__
+#define
TINC_RSA_INTERNAL
typedef RSA rsa_t;
#include "../logger.h"
typedef RSA rsa_t;
#include "../logger.h"
@@
-31,36
+29,39
@@
typedef RSA rsa_t;
/* This function prettyprints the key generation process */
static int indicator(int a, int b, BN_GENCB *cb) {
/* 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, "?");
+ }
+
+ break;
+
+ default:
+ fprintf(stderr, "?");
}
return 1;
}
return 1;
@@
-68,32
+69,29
@@
static int indicator(int a, int b, BN_GENCB *cb) {
// Generate RSA key
// 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();
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();
abort();
+ }
BN_set_word(bn_e, exponent);
BN_GENCB_set(cb, indicator, NULL);
BN_set_word(bn_e, exponent);
BN_GENCB_set(cb, indicator, NULL);
- RSA_generate_key_ex(rsa, bits, bn_e, cb);
+
int result =
RSA_generate_key_ex(rsa, bits, bn_e, cb);
BN_GENCB_free(cb);
BN_free(bn_e);
BN_GENCB_free(cb);
BN_free(bn_e);
+ if(!result) {
+ fprintf(stderr, "Error during key generation!\n");
+ RSA_free(rsa);
+ return NULL;
+ }
+
return rsa;
}
return rsa;
}