Enable and fix many extra warnings supported by GCC and Clang.

[tinc] / src / openssl / rsa.c

diff --git a/src/openssl/rsa.c b/src/openssl/rsa.c
index 48a71a9..d50ba1d 100644 (file)
--- a/src/openssl/rsa.c
+++ b/src/openssl/rsa.c
@@ -1,6 +1,6 @@
 /*
     rsa.c -- RSA key handling
-    Copyright (C) 2007-2013 Guus Sliepen <guus@tinc-vpn.org>
+    Copyright (C) 2007-2022 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
@@ -31,19 +31,7 @@ typedef RSA rsa_t;
 
 // 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) {
+rsa_t *rsa_set_hex_public_key(const char *n, const char *e) {
        BIGNUM *bn_n = NULL;
        BIGNUM *bn_e = NULL;
 
@@ -64,7 +52,7 @@ rsa_t *rsa_set_hex_public_key(char *n, char *e) {
        return rsa;
 }
 
-rsa_t *rsa_set_hex_private_key(char *n, char *e, char *d) {
+rsa_t *rsa_set_hex_private_key(const char *n, const char *e, const char *d) {
        BIGNUM *bn_n = NULL;
        BIGNUM *bn_e = NULL;
        BIGNUM *bn_d = NULL;
@@ -114,12 +102,12 @@ rsa_t *rsa_read_pem_private_key(FILE *fp) {
        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) {
-       if((size_t)RSA_public_encrypt(len, in, out, rsa, RSA_NO_PADDING) == len) {
+bool rsa_public_encrypt(rsa_t *rsa, const void *in, size_t len, void *out) {
+       if((size_t)RSA_public_encrypt((int) len, in, out, rsa, RSA_NO_PADDING) == len) {
                return true;
        }
 
@@ -127,8 +115,8 @@ bool rsa_public_encrypt(rsa_t *rsa, void *in, size_t len, void *out) {
        return false;
 }
 
-bool rsa_private_decrypt(rsa_t *rsa, void *in, size_t len, void *out) {
-       if((size_t)RSA_private_decrypt(len, in, out, rsa, RSA_NO_PADDING) == len) {
+bool rsa_private_decrypt(rsa_t *rsa, const void *in, size_t len, void *out) {
+       if((size_t)RSA_private_decrypt((int) len, in, out, rsa, RSA_NO_PADDING) == len) {
                return true;
        }
 
@@ -136,10 +124,6 @@ bool rsa_private_decrypt(rsa_t *rsa, void *in, size_t len, void *out) {
        return false;
 }
 
-bool rsa_active(rsa_t *rsa) {
-       return rsa;
-}
-
 void rsa_free(rsa_t *rsa) {
        if(rsa) {
                RSA_free(rsa);