projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Replace pointers to cipher_t/digest_t in connection_t with structs.
[tinc]
/
src
/
openssl
/
rsa.c
diff --git
a/src/openssl/rsa.c
b/src/openssl/rsa.c
index
3033bcd
..
e7428ad
100644
(file)
--- a/
src/openssl/rsa.c
+++ b/
src/openssl/rsa.c
@@
-1,6
+1,6
@@
/*
rsa.c -- RSA key handling
/*
rsa.c -- RSA key handling
- Copyright (C) 2007-20
13
Guus Sliepen <guus@tinc-vpn.org>
+ Copyright (C) 2007-20
21
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
@@
-21,8
+21,9
@@
#include <openssl/pem.h>
#include <openssl/err.h>
#include <openssl/pem.h>
#include <openssl/err.h>
+#include <openssl/rsa.h>
-#define
__TINC_RSA_INTERNAL__
+#define
TINC_RSA_INTERNAL
typedef RSA rsa_t;
#include "../logger.h"
typedef RSA rsa_t;
#include "../logger.h"
@@
-30,29
+31,22
@@
typedef RSA rsa_t;
// Set RSA keys
// Set RSA keys
-#ifndef HAVE_RSA_SET0_KEY
-int RSA_set0_key(RSA *r, BIGNUM *n, BIGNUM *e, BIGNUM *d) {
- BN_free(r->n); r->n = n;
- BN_free(r->e); r->e = e;
- BN_free(r->d); r->d = d;
- return 1;
-}
-#endif
-
rsa_t *rsa_set_hex_public_key(char *n, char *e) {
BIGNUM *bn_n = NULL;
BIGNUM *bn_e = NULL;
rsa_t *rsa_set_hex_public_key(char *n, char *e) {
BIGNUM *bn_n = NULL;
BIGNUM *bn_e = NULL;
- if(
BN_hex2bn(&bn_n, n) != strlen(n) ||
BN_hex2bn(&bn_e, e) != strlen(e)) {
+ if(
(size_t)BN_hex2bn(&bn_n, n) != strlen(n) || (size_t)
BN_hex2bn(&bn_e, e) != strlen(e)) {
BN_free(bn_e);
BN_free(bn_n);
return false;
}
rsa_t *rsa = RSA_new();
BN_free(bn_e);
BN_free(bn_n);
return false;
}
rsa_t *rsa = RSA_new();
- if(!rsa)
+
+ if(!rsa) {
return NULL;
return NULL;
-
+ }
+
RSA_set0_key(rsa, bn_n, bn_e, NULL);
return rsa;
RSA_set0_key(rsa, bn_n, bn_e, NULL);
return rsa;
@@
-63,7
+57,7
@@
rsa_t *rsa_set_hex_private_key(char *n, char *e, char *d) {
BIGNUM *bn_e = NULL;
BIGNUM *bn_d = NULL;
BIGNUM *bn_e = NULL;
BIGNUM *bn_d = NULL;
- if(
BN_hex2bn(&bn_n, n) != strlen(n) || BN_hex2bn(&bn_e, e) != strlen(e) ||
BN_hex2bn(&bn_d, d) != strlen(d)) {
+ if(
(size_t)BN_hex2bn(&bn_n, n) != strlen(n) || (size_t)BN_hex2bn(&bn_e, e) != strlen(e) || (size_t)
BN_hex2bn(&bn_d, d) != strlen(d)) {
BN_free(bn_d);
BN_free(bn_e);
BN_free(bn_n);
BN_free(bn_d);
BN_free(bn_e);
BN_free(bn_n);
@@
-71,8
+65,10
@@
rsa_t *rsa_set_hex_private_key(char *n, char *e, char *d) {
}
rsa_t *rsa = RSA_new();
}
rsa_t *rsa = RSA_new();
- if(!rsa)
+
+ if(!rsa) {
return NULL;
return NULL;
+ }
RSA_set0_key(rsa, bn_n, bn_e, bn_d);
RSA_set0_key(rsa, bn_n, bn_e, bn_d);
@@
-89,8
+85,9
@@
rsa_t *rsa_read_pem_public_key(FILE *fp) {
rsa = PEM_read_RSA_PUBKEY(fp, NULL, NULL, NULL);
}
rsa = PEM_read_RSA_PUBKEY(fp, NULL, NULL, NULL);
}
- if(!rsa)
+ if(!rsa)
{
logger(DEBUG_ALWAYS, LOG_ERR, "Unable to read RSA public key: %s", ERR_error_string(ERR_get_error(), NULL));
logger(DEBUG_ALWAYS, LOG_ERR, "Unable to read RSA public key: %s", ERR_error_string(ERR_get_error(), NULL));
+ }
return rsa;
}
return rsa;
}
@@
-98,37
+95,37
@@
rsa_t *rsa_read_pem_public_key(FILE *fp) {
rsa_t *rsa_read_pem_private_key(FILE *fp) {
rsa_t *rsa = PEM_read_RSAPrivateKey(fp, NULL, NULL, NULL);
rsa_t *rsa_read_pem_private_key(FILE *fp) {
rsa_t *rsa = PEM_read_RSAPrivateKey(fp, NULL, NULL, NULL);
- if(!rsa)
+ if(!rsa)
{
logger(DEBUG_ALWAYS, LOG_ERR, "Unable to read RSA private key: %s", ERR_error_string(ERR_get_error(), NULL));
logger(DEBUG_ALWAYS, LOG_ERR, "Unable to read RSA private key: %s", ERR_error_string(ERR_get_error(), NULL));
+ }
return rsa;
}
return rsa;
}
-size_t rsa_size(rsa_t *rsa) {
+size_t rsa_size(
const
rsa_t *rsa) {
return RSA_size(rsa);
}
bool rsa_public_encrypt(rsa_t *rsa, void *in, size_t len, void *out) {
return RSA_size(rsa);
}
bool rsa_public_encrypt(rsa_t *rsa, void *in, size_t len, void *out) {
- if(
RSA_public_encrypt(len, in, out, rsa, RSA_NO_PADDING) == len)
+ if(
(size_t)RSA_public_encrypt((int) len, in, out, rsa, RSA_NO_PADDING) == len) {
return true;
return true;
+ }
logger(DEBUG_ALWAYS, LOG_ERR, "Unable to perform RSA encryption: %s", ERR_error_string(ERR_get_error(), NULL));
return false;
}
bool rsa_private_decrypt(rsa_t *rsa, void *in, size_t len, void *out) {
logger(DEBUG_ALWAYS, LOG_ERR, "Unable to perform RSA encryption: %s", ERR_error_string(ERR_get_error(), NULL));
return false;
}
bool rsa_private_decrypt(rsa_t *rsa, void *in, size_t len, void *out) {
- if(
RSA_private_decrypt(len, in, out, rsa, RSA_NO_PADDING) == len)
+ if(
(size_t)RSA_private_decrypt((int) len, in, out, rsa, RSA_NO_PADDING) == len) {
return true;
return true;
+ }
logger(DEBUG_ALWAYS, LOG_ERR, "Unable to perform RSA decryption: %s", ERR_error_string(ERR_get_error(), NULL));
return false;
}
logger(DEBUG_ALWAYS, LOG_ERR, "Unable to perform RSA decryption: %s", ERR_error_string(ERR_get_error(), NULL));
return false;
}
-bool rsa_active(rsa_t *rsa) {
- return rsa;
-}
-
void rsa_free(rsa_t *rsa) {
void rsa_free(rsa_t *rsa) {
- if(rsa)
+ if(rsa)
{
RSA_free(rsa);
RSA_free(rsa);
+ }
}
}