X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fopenssl%2Fcipher.c;h=77538b14c23c6329a96eb94f705cbd2fc978fb52;hb=344c632c7a9f8047a412239dcd22ba1531bdfda5;hp=d51ec0d5cedd696b75a2d47cdad8472163d08642;hpb=f6e87ab476a0faf8b124ecaaa27f967d825e6457;p=tinc diff --git a/src/openssl/cipher.c b/src/openssl/cipher.c index d51ec0d5..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-2017 Guus Sliepen + Copyright (C) 2007-2022 Guus Sliepen 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 @@ -19,51 +19,49 @@ #include "../system.h" -#include #include #include +#include "log.h" +#include "cipher.h" #include "../cipher.h" #include "../logger.h" -#include "../xalloc.h" -struct cipher { - EVP_CIPHER_CTX *ctx; - const EVP_CIPHER *cipher; -}; +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 cipher_t *cipher_open(const EVP_CIPHER *evp_cipher) { - cipher_t *cipher = xzalloc(sizeof(*cipher)); +static void cipher_open(cipher_t *cipher, const EVP_CIPHER *evp_cipher) { cipher->cipher = evp_cipher; cipher->ctx = EVP_CIPHER_CTX_new(); if(!cipher->ctx) { abort(); } - - return cipher; } -cipher_t *cipher_open_by_name(const char *name) { +bool cipher_open_by_name(cipher_t *cipher, 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; + return false; } - return cipher_open(evp_cipher); + cipher_open(cipher, evp_cipher); + return true; } -cipher_t *cipher_open_by_nid(int nid) { +bool cipher_open_by_nid(cipher_t *cipher, 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; + return false; } - return cipher_open(evp_cipher); + cipher_open(cipher, evp_cipher); + return true; } void cipher_close(cipher_t *cipher) { @@ -71,8 +69,11 @@ void cipher_close(cipher_t *cipher) { return; } - EVP_CIPHER_CTX_free(cipher->ctx); - free(cipher); + if(cipher->ctx) { + EVP_CIPHER_CTX_free(cipher->ctx); + } + + memset(cipher, 0, sizeof(*cipher)); } size_t cipher_keylength(const cipher_t *cipher) { @@ -110,47 +111,42 @@ size_t cipher_blocksize(const cipher_t *cipher) { return EVP_CIPHER_block_size(cipher->cipher); } -bool cipher_set_key(cipher_t *cipher, void *key, 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, (unsigned char *)key + EVP_CIPHER_key_length(cipher->cipher)); + result = EVP_EncryptInit_ex(cipher->ctx, cipher->cipher, NULL, key, iv); } else { - result = EVP_DecryptInit_ex(cipher->ctx, cipher->cipher, NULL, (unsigned char *)key, (unsigned char *)key + EVP_CIPHER_key_length(cipher->cipher)); + result = EVP_DecryptInit_ex(cipher->ctx, cipher->cipher, NULL, key, iv); } if(result) { return true; } - logger(DEBUG_ALWAYS, LOG_ERR, "Error while setting key: %s", ERR_error_string(ERR_get_error(), NULL)); + openssl_err("set key"); return false; } -bool cipher_set_key_from_rsa(cipher_t *cipher, void *key, size_t len, bool encrypt) { - bool result; - - if(encrypt) { - result = EVP_EncryptInit_ex(cipher->ctx, cipher->cipher, NULL, (unsigned char *)key + len - EVP_CIPHER_key_length(cipher->cipher), (unsigned char *)key + len - EVP_CIPHER_iv_length(cipher->cipher) - EVP_CIPHER_key_length(cipher->cipher)); - } else { - result = EVP_DecryptInit_ex(cipher->ctx, cipher->cipher, NULL, (unsigned char *)key + len - EVP_CIPHER_key_length(cipher->cipher), (unsigned char *)key + len - EVP_CIPHER_iv_length(cipher->cipher) - EVP_CIPHER_key_length(cipher->cipher)); - } - - if(result) { - 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); +} - logger(DEBUG_ALWAYS, LOG_ERR, "Error while setting key: %s", ERR_error_string(ERR_get_error(), NULL)); - return false; +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_ex(cipher->ctx, (unsigned char *)outdata + 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; } @@ -160,7 +156,7 @@ bool cipher_encrypt(cipher_t *cipher, const void *indata, size_t inlen, void *ou } else { int len; - if(EVP_EncryptUpdate(cipher->ctx, outdata, &len, indata, inlen)) { + if(update(cipher->ctx, outdata, &len, indata, (int)inlen)) { if(outlen) { *outlen = len; } @@ -169,37 +165,18 @@ bool cipher_encrypt(cipher_t *cipher, const void *indata, size_t inlen, void *ou } } - logger(DEBUG_ALWAYS, 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_ex(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(DEBUG_ALWAYS, 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) {