X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fopenssl%2Fcipher.c;h=77538b14c23c6329a96eb94f705cbd2fc978fb52;hb=344c632c7a9f8047a412239dcd22ba1531bdfda5;hp=63892f3adba0afc049fe0bd3a35d2fc5299cdfed;hpb=3fba80174dbe29bcfe0d121a2a1d2e61be5ee57b;p=tinc

diff --git a/src/openssl/cipher.c b/src/openssl/cipher.c
index 63892f3a..77538b14 100644
--- 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-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
@@ -17,191 +17,176 @@
     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 "log.h"
 #include "cipher.h"
-#include "logger.h"
-#include "xalloc.h"
+#include "../cipher.h"
+#include "../logger.h"
 
-typedef struct cipher_counter {
-	unsigned char counter[EVP_MAX_IV_LENGTH];
-	unsigned char block[EVP_MAX_IV_LENGTH];
-	int n;
-} cipher_counter_t;
+typedef int (enc_init_t)(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher, ENGINE *impl, const unsigned char *key, const unsigned char *iv);
+typedef int (enc_update_t)(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl, const unsigned char *in, int inl);
+typedef int (enc_final_t)(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl);
 
-static bool cipher_open(cipher_t *cipher) {
-	EVP_CIPHER_CTX_init(&cipher->ctx);
+static void cipher_open(cipher_t *cipher, const EVP_CIPHER *evp_cipher) {
+	cipher->cipher = evp_cipher;
+	cipher->ctx = EVP_CIPHER_CTX_new();
 
-	return true;
+	if(!cipher->ctx) {
+		abort();
+	}
 }
 
 bool cipher_open_by_name(cipher_t *cipher, const char *name) {
-	cipher->cipher = EVP_get_cipherbyname(name);
+	const EVP_CIPHER *evp_cipher = EVP_get_cipherbyname(name);
 
-	if(cipher->cipher)
-		return cipher_open(cipher);
+	if(!evp_cipher) {
+		logger(DEBUG_ALWAYS, LOG_ERR, "Unknown cipher name '%s'!", name);
+		return false;
+	}
 
-	logger(LOG_ERR, "Unknown cipher name '%s'!", name);
-	return false;
+	cipher_open(cipher, evp_cipher);
+	return true;
 }
 
 bool cipher_open_by_nid(cipher_t *cipher, int nid) {
-	cipher->cipher = EVP_get_cipherbynid(nid);
-
-	if(cipher->cipher)
-		return cipher_open(cipher);
+	const EVP_CIPHER *evp_cipher = EVP_get_cipherbynid(nid);
 
-	logger(LOG_ERR, "Unknown cipher nid %d!", nid);
-	return false;
-}
+	if(!evp_cipher) {
+		logger(DEBUG_ALWAYS, LOG_ERR, "Unknown cipher nid %d!", nid);
+		return false;
+	}
 
-bool cipher_open_blowfish_ofb(cipher_t *cipher) {
-	cipher->cipher = EVP_bf_ofb();
-	return cipher_open(cipher);
+	cipher_open(cipher, evp_cipher);
+	return true;
 }
 
 void cipher_close(cipher_t *cipher) {
-	EVP_CIPHER_CTX_cleanup(&cipher->ctx);
-	if(cipher->counter) {
-		free(cipher->counter);
-		cipher->counter = 0;
+	if(!cipher) {
+		return;
 	}
+
+	if(cipher->ctx) {
+		EVP_CIPHER_CTX_free(cipher->ctx);
+	}
+
+	memset(cipher, 0, sizeof(*cipher));
 }
 
 size_t cipher_keylength(const cipher_t *cipher) {
-	return cipher->cipher->key_len + cipher->cipher->block_size;
+	if(!cipher || !cipher->cipher) {
+		return 0;
+	}
+
+	return EVP_CIPHER_key_length(cipher->cipher) + EVP_CIPHER_iv_length(cipher->cipher);
 }
 
-bool cipher_set_key(cipher_t *cipher, void *key, bool encrypt) {
-	bool result;
+uint64_t cipher_budget(const cipher_t *cipher) {
+	/* Hopefully some failsafe way to calculate the maximum amount of bytes to
+	   send/receive with a given cipher before we might run into birthday paradox
+	   attacks. Because we might use different modes, the block size of the mode
+	   might be 1 byte. In that case, use the IV length. Ensure the whole thing
+	   is limited to what can be represented with a 64 bits integer.
+	 */
 
-	if(encrypt)
-		result = EVP_EncryptInit_ex(&cipher->ctx, cipher->cipher, NULL, (unsigned char *)key, (unsigned char *)key + cipher->cipher->key_len);
-	else
-		result = EVP_DecryptInit_ex(&cipher->ctx, cipher->cipher, NULL, (unsigned char *)key, (unsigned char *)key + cipher->cipher->key_len);
+	if(!cipher || !cipher->cipher) {
+		return UINT64_MAX;        // NULL cipher
+	}
 
-	if(result)
-		return true;
+	int ivlen = EVP_CIPHER_iv_length(cipher->cipher);
+	int blklen = EVP_CIPHER_block_size(cipher->cipher);
+	int len = blklen > 1 ? blklen : ivlen > 1 ? ivlen : 8;
+	int bits = len * 4 - 1;
+	return bits < 64 ? UINT64_C(1) << bits : UINT64_MAX;
+}
 
-	logger(LOG_ERR, "Error while setting key: %s", ERR_error_string(ERR_get_error(), NULL));
-	return false;
+size_t cipher_blocksize(const cipher_t *cipher) {
+	if(!cipher || !cipher->cipher) {
+		return 1;
+	}
+
+	return EVP_CIPHER_block_size(cipher->cipher);
 }
 
-bool cipher_set_key_from_rsa(cipher_t *cipher, void *key, size_t len, bool encrypt) {
+static bool cipher_init_ctx(cipher_t *cipher, bool encrypt, const unsigned char *key, const unsigned char *iv) {
 	bool result;
 
-	if(encrypt)
-		result = EVP_EncryptInit_ex(&cipher->ctx, cipher->cipher, NULL, (unsigned char *)key + len - cipher->cipher->key_len, (unsigned char *)key + len - cipher->cipher->iv_len - cipher->cipher->key_len);
-	else
-		result = EVP_DecryptInit_ex(&cipher->ctx, cipher->cipher, NULL, (unsigned char *)key + len - cipher->cipher->key_len, (unsigned char *)key + len - cipher->cipher->iv_len - cipher->cipher->key_len);
+	if(encrypt) {
+		result = EVP_EncryptInit_ex(cipher->ctx, cipher->cipher, NULL, key, iv);
+	} else {
+		result = EVP_DecryptInit_ex(cipher->ctx, cipher->cipher, NULL, key, iv);
+	}
 
-	if(result)
+	if(result) {
 		return true;
+	}
 
-	logger(LOG_ERR, "Error while setting key: %s", ERR_error_string(ERR_get_error(), NULL));
+	openssl_err("set key");
 	return false;
 }
 
-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(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_set_key(cipher_t *cipher, void *key, bool encrypt) {
+	unsigned char *iv = (unsigned char *)key + EVP_CIPHER_key_length(cipher->cipher);
+	return cipher_init_ctx(cipher, encrypt, key, iv);
 }
 
-bool cipher_counter_xor(cipher_t *cipher, const void *indata, size_t inlen, void *outdata) {
-	if(!cipher->counter) {
-		logger(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(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_set_key_from_rsa(cipher_t *cipher, void *key, size_t len, bool encrypt) {
+	unsigned char *k = (unsigned char *)key + len - EVP_CIPHER_key_length(cipher->cipher);
+	unsigned char *iv = k - EVP_CIPHER_iv_length(cipher->cipher);
+	return cipher_init_ctx(cipher, encrypt, k, iv);
 }
 
-
-bool cipher_encrypt(cipher_t *cipher, const void *indata, size_t inlen, void *outdata, size_t *outlen, bool oneshot) {
+static bool cipher_encrypt_decrypt(cipher_t *cipher, const void *indata, size_t inlen, void *outdata, size_t *outlen, bool oneshot,
+                                   enc_init_t init, enc_update_t update, enc_final_t final) {
 	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)) {
-			if(outlen) *outlen = len + pad;
+
+		if(init(cipher->ctx, NULL, NULL, NULL, NULL)
+		                && update(cipher->ctx, (unsigned char *)outdata, &len, indata, (int)inlen)
+		                && final(cipher->ctx, (unsigned char *)outdata + len, &pad)) {
+			if(outlen) {
+				*outlen = len + pad;
+			}
+
 			return true;
 		}
 	} else {
 		int len;
-		if(EVP_EncryptUpdate(&cipher->ctx, outdata, &len, indata, inlen)) {
-			if(outlen) *outlen = len;
+
+		if(update(cipher->ctx, outdata, &len, indata, (int)inlen)) {
+			if(outlen) {
+				*outlen = len;
+			}
+
 			return true;
 		}
 	}
 
-	logger(LOG_ERR, "Error while encrypting: %s", ERR_error_string(ERR_get_error(), NULL));
+	openssl_err("encrypt or decrypt data");
 	return false;
 }
 
-bool cipher_decrypt(cipher_t *cipher, const void *indata, size_t inlen, void *outdata, size_t *outlen, bool oneshot) {
-	if(oneshot) {
-		int len, pad;
-		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)) {
-			if(outlen) *outlen = len + pad;
-			return true;
-		}
-	} else {
-		int len;
-		if(EVP_EncryptUpdate(&cipher->ctx, outdata, &len, indata, inlen)) {
-			if(outlen) *outlen = len;
-			return true;
-		}
-	}
+bool cipher_encrypt(cipher_t *cipher, const void *indata, size_t inlen, void *outdata, size_t *outlen, bool oneshot) {
+	return cipher_encrypt_decrypt(cipher, indata, inlen, outdata, outlen, oneshot,
+	                              EVP_EncryptInit_ex, EVP_EncryptUpdate, EVP_EncryptFinal_ex);
+}
 
-	logger(LOG_ERR, "Error while decrypting: %s", ERR_error_string(ERR_get_error(), NULL));
-	return false;
+bool cipher_decrypt(cipher_t *cipher, const void *indata, size_t inlen, void *outdata, size_t *outlen, bool oneshot) {
+	return cipher_encrypt_decrypt(cipher, indata, inlen, outdata, outlen, oneshot,
+	                              EVP_DecryptInit_ex, EVP_DecryptUpdate, EVP_DecryptFinal_ex);
 }
 
 int cipher_get_nid(const cipher_t *cipher) {
-	return cipher->cipher ? cipher->cipher->nid : 0;
+	if(!cipher || !cipher->cipher) {
+		return 0;
+	}
+
+	return EVP_CIPHER_nid(cipher->cipher);
 }
 
 bool cipher_active(const cipher_t *cipher) {
-	return cipher->cipher && cipher->cipher->nid != 0;
+	return cipher && cipher->cipher && EVP_CIPHER_nid(cipher->cipher) != 0;
 }