denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

simplified the OpenSSL crypter a bit

Browse Source
This commit is contained in:
Tobias Brunner
2008-04-30 09:24:22 +00:00
parent 87aa386df1
commit d691080cfc
1 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libstrongswan/plugins/openssl/openssl_crypter.c
+4 -10
View File
@@ -115,21 +115,15 @@ static char* lookup_algorithm(openssl_algorithm_t *openssl_algo,
static void crypt(private_openssl_crypter_t *this, chunk_t data, static void crypt(private_openssl_crypter_t *this, chunk_t data,
chunk_t iv, chunk_t *dst, int enc) chunk_t iv, chunk_t *dst, int enc)
{ {
int len, finlen; int len;
unsigned char buf[data.len + this->cipher->block_size];
EVP_CIPHER_CTX ctx; EVP_CIPHER_CTX ctx;
EVP_CIPHER_CTX_init(&ctx); EVP_CIPHER_CTX_init(&ctx);
EVP_CipherInit_ex(&ctx, this->cipher, NULL, this->key.ptr, iv.ptr, enc); EVP_CipherInit_ex(&ctx, this->cipher, NULL, this->key.ptr, iv.ptr, enc);
EVP_CIPHER_CTX_set_padding(&ctx, 0); /* disable padding */ EVP_CIPHER_CTX_set_padding(&ctx, 0); /* disable padding */
EVP_CipherUpdate(&ctx, buf, &len, data.ptr, data.len); *dst = chunk_alloc(data.len);
EVP_CipherFinal_ex(&ctx, buf + len, &finlen); EVP_CipherUpdate(&ctx, dst->ptr, &len, data.ptr, data.len);
len += finlen; EVP_CipherFinal_ex(&ctx, dst->ptr, &len); /* since padding is disabled this does nothing */
*dst = chunk_alloc(len);
memcpy(dst->ptr, buf, len);
EVP_CIPHER_CTX_cleanup(&ctx); EVP_CIPHER_CTX_cleanup(&ctx);
/* TODO: because we don't use padding, we can simplify this a bit because
* EVP_CryptFinal_ex does not do anything but checking if any data is left.
* so we can work without buffer and fill the dst directly */
} }
/** /**