Don't assume sa.sa_family is a short int.

[tinc] / src / openssl / rsa.c

diff --git a/src/openssl/rsa.c b/src/openssl/rsa.c
index 9c880e6..9c1f498 100644 (file)
--- a/src/openssl/rsa.c
+++ b/src/openssl/rsa.c
@@ -1,6 +1,6 @@
 /*
     rsa.c -- RSA key handling
-    Copyright (C) 2007 Guus Sliepen <guus@tinc-vpn.org>
+    Copyright (C) 2007-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
@@ -17,85 +17,95 @@
     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 "rsa.h"
+#define __TINC_RSA_INTERNAL__
+typedef RSA rsa_t;
+
+#include "../logger.h"
+#include "../rsa.h"
 
 // Set RSA keys
 
-bool rsa_set_hex_public_key(rsa_t *rsa, char *n, char *e) {
-       *rsa = RSA_new();
-       BN_hex2bn(&(*rsa)->n, n);
-       BN_hex2bn(&(*rsa)->e, e);
-       return true;
+rsa_t *rsa_set_hex_public_key(char *n, char *e) {
+       rsa_t *rsa = RSA_new();
+       if(!rsa)
+               return NULL;
+
+       if(BN_hex2bn(&rsa->n, n) != strlen(n) || BN_hex2bn(&rsa->e, e) != strlen(e)) {
+               RSA_free(rsa);
+               return false;
+       }
+
+       return rsa;
 }
 
-bool rsa_set_hex_private_key(rsa_t *rsa, char *n, char *e, char *d) {
-       *rsa = RSA_new();
-       BN_hex2bn(&(*rsa)->n, n);
-       BN_hex2bn(&(*rsa)->e, e);
-       BN_hex2bn(&(*rsa)->d, d);
-       return true;
+rsa_t *rsa_set_hex_private_key(char *n, char *e, char *d) {
+       rsa_t *rsa = RSA_new();
+       if(!rsa)
+               return NULL;
+
+       if(BN_hex2bn(&rsa->n, n) != strlen(n) || BN_hex2bn(&rsa->e, e) != strlen(e) || BN_hex2bn(&rsa->d, d) != strlen(d)) {
+               RSA_free(rsa);
+               return false;
+       }
+
+       return rsa;
 }
 
 // Read PEM RSA keys
 
-bool rsa_read_pem_public_key(rsa_t *rsa, FILE *fp) {
-       *rsa = PEM_read_RSAPublicKey(fp, rsa, NULL, NULL);
+rsa_t *rsa_read_pem_public_key(FILE *fp) {
+       rsa_t *rsa = PEM_read_RSAPublicKey(fp, NULL, NULL, NULL);
 
-       if(*rsa)
-               return true;
-       
-       *rsa = PEM_read_RSA_PUBKEY(fp, rsa, NULL, NULL);
+       if(!rsa) {
+               rewind(fp);
+               rsa = PEM_read_RSA_PUBKEY(fp, NULL, NULL, NULL);
+       }
 
-       if(*rsa)
-               return true;
+       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 false;
+       return rsa;
 }
 
-bool rsa_read_pem_private_key(rsa_t *rsa, FILE *fp) {
-       *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)
-               return true;
-       
-       logger(DEBUG_ALWAYS, LOG_ERR, "Unable to read RSA private key: %s", ERR_error_string(ERR_get_error(), NULL));
-       return false;
+       if(!rsa)
+               logger(DEBUG_ALWAYS, LOG_ERR, "Unable to read RSA private key: %s", ERR_error_string(ERR_get_error(), NULL));
+
+       return rsa;
 }
 
 size_t rsa_size(rsa_t *rsa) {
-       return RSA_size(*rsa);
+       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(RSA_public_encrypt(len, in, out, rsa, RSA_NO_PADDING) == len)
                return true;
 
        logger(DEBUG_ALWAYS, LOG_ERR, "Unable to perform RSA encryption: %s", ERR_error_string(ERR_get_error(), NULL));
-       return false;   
+       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(RSA_private_decrypt(len, in, out, rsa, RSA_NO_PADDING) == len)
                return true;
 
        logger(DEBUG_ALWAYS, LOG_ERR, "Unable to perform RSA decryption: %s", ERR_error_string(ERR_get_error(), NULL));
-       return false;   
+       return false;
 }
 
 bool rsa_active(rsa_t *rsa) {
-       return *rsa;
+       return rsa;
 }
 
 void rsa_free(rsa_t *rsa) {
-       if(*rsa) {
-               RSA_free(*rsa);
-               *rsa = NULL;
-       }
+       if(rsa)
+               RSA_free(rsa);
 }