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

[tinc] / src / openssl / cipher.c

diff --git a/src/openssl/cipher.c b/src/openssl/cipher.c
index 86a1aca..04aee27 100644 (file)
--- a/src/openssl/cipher.c
+++ b/src/openssl/cipher.c
@@ -1,6 +1,6 @@
 /*
     cipher.c -- Symmetric block cipher 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,54 +17,75 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#include "system.h"
+#include "../system.h"
 
 #include <openssl/rand.h>
 #include <openssl/err.h>
+#include <openssl/evp.h>
 
-#include "cipher.h"
-#include "logger.h"
-#include "xalloc.h"
+#include "../cipher.h"
+#include "../logger.h"
+#include "../xalloc.h"
 
-static bool cipher_open(cipher_t *cipher) {
+struct cipher {
+       EVP_CIPHER_CTX ctx;
+       const EVP_CIPHER *cipher;
+};
+
+static cipher_t *cipher_open(const EVP_CIPHER *evp_cipher) {
+       cipher_t *cipher = xzalloc(sizeof *cipher);
+       cipher->cipher = evp_cipher;
        EVP_CIPHER_CTX_init(&cipher->ctx);
 
-       return true;
+       return cipher;
 }
 
-bool cipher_open_by_name(cipher_t *cipher, const char *name) {
-       cipher->cipher = EVP_get_cipherbyname(name);
-
-       if(cipher->cipher)
-               return cipher_open(cipher);
+cipher_t *cipher_open_by_name(const char *name) {
+       const EVP_CIPHER *evp_cipher = EVP_get_cipherbyname(name);
+       if(!evp_cipher) {
+               logger(DEBUG_ALWAYS, LOG_ERR, "Unknown cipher name '%s'!", name);
+               return NULL;
+       }
 
-       logger(LOG_ERR, "Unknown cipher name '%s'!", name);
-       return false;
+       return cipher_open(evp_cipher);
 }
 
-bool cipher_open_by_nid(cipher_t *cipher, int nid) {
-       cipher->cipher = EVP_get_cipherbynid(nid);
-
-       if(cipher->cipher)
-               return cipher_open(cipher);
+cipher_t *cipher_open_by_nid(int nid) {
+       const EVP_CIPHER *evp_cipher = EVP_get_cipherbynid(nid);
+       if(!evp_cipher) {
+               logger(DEBUG_ALWAYS, LOG_ERR, "Unknown cipher nid %d!", nid);
+               return NULL;
+       }
 
-       logger(LOG_ERR, "Unknown cipher nid %d!", nid);
-       return false;
+       return cipher_open(evp_cipher);
 }
 
-bool cipher_open_blowfish_ofb(cipher_t *cipher) {
-       cipher->cipher = EVP_bf_ofb();
-       return cipher_open(cipher);
+cipher_t *cipher_open_blowfish_ofb(void) {
+       return cipher_open(EVP_bf_ofb());
 }
 
 void cipher_close(cipher_t *cipher) {
+       if(!cipher)
+               return;
+
        EVP_CIPHER_CTX_cleanup(&cipher->ctx);
+       free(cipher);
 }
 
 size_t cipher_keylength(const cipher_t *cipher) {
+       if(!cipher || !cipher->cipher)
+               return 0;
+
        return cipher->cipher->key_len + cipher->cipher->iv_len;
 }
 
+size_t cipher_blocksize(const cipher_t *cipher) {
+       if(!cipher || !cipher->cipher)
+               return 1;
+
+       return cipher->cipher->block_size;
+}
+
 bool cipher_set_key(cipher_t *cipher, void *key, bool encrypt) {
        bool result;
 
@@ -76,7 +97,7 @@ bool cipher_set_key(cipher_t *cipher, void *key, bool encrypt) {
        if(result)
                return true;
 
-       logger(LOG_ERR, "Error while setting key: %s", ERR_error_string(ERR_get_error(), NULL));
+       logger(DEBUG_ALWAYS, LOG_ERR, "Error while setting key: %s", ERR_error_string(ERR_get_error(), NULL));
        return false;
 }
 
@@ -91,7 +112,7 @@ bool cipher_set_key_from_rsa(cipher_t *cipher, void *key, size_t len, bool encry
        if(result)
                return true;
 
-       logger(LOG_ERR, "Error while setting key: %s", ERR_error_string(ERR_get_error(), NULL));
+       logger(DEBUG_ALWAYS, LOG_ERR, "Error while setting key: %s", ERR_error_string(ERR_get_error(), NULL));
        return false;
 }
 
@@ -101,18 +122,18 @@ bool cipher_encrypt(cipher_t *cipher, const void *indata, size_t inlen, void *ou
                if(EVP_EncryptInit_ex(&cipher->ctx, NULL, NULL, NULL, NULL)
                                && EVP_EncryptUpdate(&cipher->ctx, (unsigned char *)outdata, &len, indata, inlen)
                                && EVP_EncryptFinal(&cipher->ctx, (unsigned char *)outdata + len, &pad)) {
-                       *outlen = len + pad;
+                       if(outlen) *outlen = len + pad;
                        return true;
                }
        } else {
                int len;
                if(EVP_EncryptUpdate(&cipher->ctx, outdata, &len, indata, inlen)) {
-                       *outlen = len;
+                       if(outlen) *outlen = len;
                        return true;
                }
        }
 
-       logger(LOG_ERR, "Error while encrypting: %s", ERR_error_string(ERR_get_error(), NULL));
+       logger(DEBUG_ALWAYS, LOG_ERR, "Error while encrypting: %s", ERR_error_string(ERR_get_error(), NULL));
        return false;
 }
 
@@ -122,25 +143,28 @@ bool cipher_decrypt(cipher_t *cipher, const void *indata, size_t inlen, void *ou
                if(EVP_DecryptInit_ex(&cipher->ctx, NULL, NULL, NULL, NULL)
                                && EVP_DecryptUpdate(&cipher->ctx, (unsigned char *)outdata, &len, indata, inlen)
                                && EVP_DecryptFinal(&cipher->ctx, (unsigned char *)outdata + len, &pad)) {
-                       *outlen = len + pad;
+                       if(outlen) *outlen = len + pad;
                        return true;
                }
        } else {
                int len;
                if(EVP_EncryptUpdate(&cipher->ctx, outdata, &len, indata, inlen)) {
-                       *outlen = len;
+                       if(outlen) *outlen = len;
                        return true;
                }
        }
 
-       logger(LOG_ERR, "Error while decrypting: %s", ERR_error_string(ERR_get_error(), NULL));
+       logger(DEBUG_ALWAYS, LOG_ERR, "Error while decrypting: %s", ERR_error_string(ERR_get_error(), NULL));
        return false;
 }
 
 int cipher_get_nid(const cipher_t *cipher) {
-       return cipher->cipher ? cipher->cipher->nid : 0;
+       if(!cipher || !cipher->cipher)
+               return 0;
+
+       return cipher->cipher->nid;
 }
 
 bool cipher_active(const cipher_t *cipher) {
-       return cipher->cipher && cipher->cipher->nid != 0;
+       return cipher && cipher->cipher && cipher->cipher->nid != 0;
 }