projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix `make distcheck`
[tinc]
/
src
/
openssl
/
rsagen.c
diff --git
a/src/openssl/rsagen.c
b/src/openssl/rsagen.c
index
79127f6
..
3674057
100644
(file)
--- a/
src/openssl/rsagen.c
+++ b/
src/openssl/rsagen.c
@@
-1,6
+1,6
@@
/*
rsagen.c -- RSA key generation and export
/*
rsagen.c -- RSA key generation and export
- Copyright (C) 2008-20
13
Guus Sliepen <guus@tinc-vpn.org>
+ Copyright (C) 2008-20
22
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
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
@@
-27,7
+27,6
@@
typedef RSA rsa_t;
#include "../logger.h"
#include "../rsagen.h"
#include "../logger.h"
#include "../rsagen.h"
-#include "../xalloc.h"
/* This function prettyprints the key generation process */
/* This function prettyprints the key generation process */
@@
-72,16
+71,6
@@
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();
rsa_t *rsa_generate(size_t bits, unsigned long exponent) {
BIGNUM *bn_e = BN_new();
rsa_t *rsa = RSA_new();
@@
-94,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);
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);
BN_GENCB_free(cb);
BN_free(bn_e);