Fix whitespace.

[tinc] / src / openssl / cipher.c

diff --git a/src/openssl/cipher.c b/src/openssl/cipher.c
index 86a1aca..b2edcc7 100644 (file)
--- a/src/openssl/cipher.c
+++ b/src/openssl/cipher.c
@@ -26,6 +26,12 @@
 #include "logger.h"
 #include "xalloc.h"
 
+typedef struct cipher_counter {
+       unsigned char counter[EVP_MAX_IV_LENGTH];
+       unsigned char block[EVP_MAX_IV_LENGTH];
+       int n;
+} cipher_counter_t;
+
 static bool cipher_open(cipher_t *cipher) {
        EVP_CIPHER_CTX_init(&cipher->ctx);
 
@@ -38,7 +44,7 @@ bool cipher_open_by_name(cipher_t *cipher, const char *name) {
        if(cipher->cipher)
                return cipher_open(cipher);
 
-       logger(LOG_ERR, "Unknown cipher name '%s'!", name);
+       logger(DEBUG_ALWAYS, LOG_ERR, "Unknown cipher name '%s'!", name);
        return false;
 }
 
@@ -48,7 +54,7 @@ bool cipher_open_by_nid(cipher_t *cipher, int nid) {
        if(cipher->cipher)
                return cipher_open(cipher);
 
-       logger(LOG_ERR, "Unknown cipher nid %d!", nid);
+       logger(DEBUG_ALWAYS, LOG_ERR, "Unknown cipher nid %d!", nid);
        return false;
 }
 
@@ -59,10 +65,12 @@ bool cipher_open_blowfish_ofb(cipher_t *cipher) {
 
 void cipher_close(cipher_t *cipher) {
        EVP_CIPHER_CTX_cleanup(&cipher->ctx);
+       free(cipher->counter);
+       cipher->counter = NULL;
 }
 
 size_t cipher_keylength(const cipher_t *cipher) {
-       return cipher->cipher->key_len + cipher->cipher->iv_len;
+       return cipher->cipher->key_len + cipher->cipher->block_size;
 }
 
 bool cipher_set_key(cipher_t *cipher, void *key, bool encrypt) {
@@ -76,7 +84,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,28 +99,92 @@ 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;
 }
 
+bool cipher_set_counter(cipher_t *cipher, const void *counter, size_t len) {
+       if(len > cipher->cipher->block_size - 4) {
+               logger(DEBUG_ALWAYS, LOG_ERR, "Counter too long");
+               abort();
+       }
+
+       memcpy(cipher->counter->counter + cipher->cipher->block_size - len, counter, len);
+       memset(cipher->counter->counter, 0, 4);
+       cipher->counter->n = 0;
+
+       return true;
+}
+
+bool cipher_set_counter_key(cipher_t *cipher, void *key) {
+       int result = EVP_EncryptInit_ex(&cipher->ctx, cipher->cipher, NULL, (unsigned char *)key, NULL);
+       if(!result) {
+               logger(DEBUG_ALWAYS, LOG_ERR, "Error while setting key: %s", ERR_error_string(ERR_get_error(), NULL));
+               return false;
+       }
+
+       if(!cipher->counter)
+               cipher->counter = xmalloc_and_zero(sizeof *cipher->counter);
+       else
+               cipher->counter->n = 0;
+
+       memcpy(cipher->counter->counter, (unsigned char *)key + cipher->cipher->key_len, cipher->cipher->block_size);
+
+       return true;
+}
+
+bool cipher_counter_xor(cipher_t *cipher, const void *indata, size_t inlen, void *outdata) {
+       if(!cipher->counter) {
+               logger(DEBUG_ALWAYS, LOG_ERR, "Counter not initialized");
+               return false;
+       }
+
+       const unsigned char *in = indata;
+       unsigned char *out = outdata;
+
+       while(inlen--) {
+               // Encrypt the new counter value if we need it
+               if(!cipher->counter->n) {
+                       int len;
+                       if(!EVP_EncryptUpdate(&cipher->ctx, cipher->counter->block, &len, cipher->counter->counter, cipher->cipher->block_size)) {
+                               logger(DEBUG_ALWAYS, LOG_ERR, "Error while encrypting: %s", ERR_error_string(ERR_get_error(), NULL));
+                               return false;
+                       }
+
+                       // Increase the counter value
+                       for(int i = 0; i < cipher->cipher->block_size; i++)
+                               if(++cipher->counter->counter[i])
+                                       break;
+               }
+
+               *out++ = *in++ ^ cipher->counter->counter[cipher->counter->n++];
+
+               if(cipher->counter->n >= cipher->cipher->block_size)
+                       cipher->counter->n = 0;
+       }
+
+       return true;
+}
+
+
 bool cipher_encrypt(cipher_t *cipher, const void *indata, size_t inlen, void *outdata, size_t *outlen, bool oneshot) {
        if(oneshot) {
                int len, pad;
                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,18 +194,18 @@ 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;
 }