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

wolfssl: Support of AES-CFB encryption

Browse Source
This commit is contained in:
Andreas Steffen
2021-12-06 12:53:11 +01:00
parent 695a04d146
commit 54d7e39d40
3 changed files with 59 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libstrongswan/plugins/wolfssl/wolfssl_crypter.c
+53 -1
View File
@@ -48,7 +48,7 @@ struct private_wolfssl_crypter_t {
* wolfSSL cipher
*/
union {
#if !defined(NO_AES) && (!defined(NO_AES_CBC) || defined(HAVE_AES_ECB) || defined(WOLFSSL_AES_COUNTER))
#if !defined(NO_AES) && (!defined(NO_AES_CBC) || defined(HAVE_AES_ECB) || defined(WOLFSSL_AES_CFB) || defined(WOLFSSL_AES_COUNTER))
Aes aes;
#endif
#ifdef HAVE_CAMELLIA
@@ -141,6 +141,18 @@ METHOD(crypter_t, decrypt, bool,
success = (ret == 0);
break;
#endif
#if !defined(NO_AES) && defined(WOLFSSL_AES_CFB)
case ENCR_AES_CFB:
ret = wc_AesSetKey(&this->cipher.aes, this->key.ptr, this->key.len,
iv.ptr, AES_ENCRYPTION);
if (ret == 0)
{
ret = wc_AesCfbDecrypt(&this->cipher.aes, out, data.ptr,
data.len);
}
success = (ret == 0);
break;
#endif
#if !defined(NO_AES) && defined(WOLFSSL_AES_COUNTER)
case ENCR_AES_CTR:
if (out == data.ptr)
@@ -273,6 +285,18 @@ METHOD(crypter_t, encrypt, bool,
success = (ret == 0);
break;
#endif
#if !defined(NO_AES) && defined(WOLFSSL_AES_CFB)
case ENCR_AES_CFB:
ret = wc_AesSetKey(&this->cipher.aes, this->key.ptr, this->key.len,
iv.ptr, AES_ENCRYPTION);
if (ret == 0)
{
ret = wc_AesCfbEncrypt(&this->cipher.aes, out, data.ptr,
data.len);
}
success = (ret == 0);
break;
#endif
#if !defined(NO_AES) && defined(WOLFSSL_AES_COUNTER)
case ENCR_AES_CTR:
if (out == data.ptr)
@@ -395,6 +419,11 @@ METHOD(crypter_t, destroy, void,
wc_AesFree(&this->cipher.aes);
break;
#endif
#if !defined(NO_AES) && defined(WOLFSSL_AES_CFB)
case ENCR_AES_CFB:
wc_AesFree(&this->cipher.aes);
break;
#endif
#if !defined(NO_AES) && defined(WOLFSSL_AES_COUNTER)
case ENCR_AES_CTR:
wc_AesFree(&this->cipher.aes);
@@ -466,6 +495,24 @@ wolfssl_crypter_t *wolfssl_crypter_create(encryption_algorithm_t algo,
}
break;
#endif
#if !defined(NO_AES) && defined(WOLFSSL_AES_CFB)
case ENCR_AES_CFB:
switch (key_size)
{
case 0:
key_size = 16;
/* fall-through */
case 16:
case 24:
case 32:
block_size = AES_BLOCK_SIZE;
iv_size = AES_IV_SIZE;
break;
default:
return NULL;
}
break;
#endif
#if !defined(NO_AES) && defined(WOLFSSL_AES_COUNTER)
case ENCR_AES_CTR:
switch (key_size)
@@ -557,6 +604,11 @@ wolfssl_crypter_t *wolfssl_crypter_create(encryption_algorithm_t algo,
ret = wc_AesInit(&this->cipher.aes, NULL, INVALID_DEVID);
break;
#endif
#if !defined(NO_AES) && defined(WOLFSSL_AES_CFB)
case ENCR_AES_CFB:
ret = wc_AesInit(&this->cipher.aes, NULL, INVALID_DEVID);
break;
#endif
#if !defined(NO_AES) && defined(WOLFSSL_AES_COUNTER)
case ENCR_AES_CTR:
ret = wc_AesInit(&this->cipher.aes, NULL, INVALID_DEVID);
src/libstrongswan/plugins/wolfssl/wolfssl_plugin.c
+5
View File
@@ -87,6 +87,11 @@ METHOD(plugin_t, get_features, int,
PLUGIN_PROVIDE(CRYPTER, ENCR_AES_ECB, 24),
PLUGIN_PROVIDE(CRYPTER, ENCR_AES_ECB, 32),
#endif
#if !defined(NO_AES) && defined(WOLFSSL_AES_CFB)
PLUGIN_PROVIDE(CRYPTER, ENCR_AES_CFB, 16),
PLUGIN_PROVIDE(CRYPTER, ENCR_AES_CFB, 24),
PLUGIN_PROVIDE(CRYPTER, ENCR_AES_CFB, 32),
#endif
#ifdef HAVE_CAMELLIA
PLUGIN_PROVIDE(CRYPTER, ENCR_CAMELLIA_CBC, 16),
PLUGIN_PROVIDE(CRYPTER, ENCR_CAMELLIA_CBC, 24),
testing/scripts/recipes/012_wolfssl.mk
+1
View File
@@ -19,6 +19,7 @@ CONFIG_OPTS = \
--enable-silent-rules \
--enable-aesccm \
--enable-aesctr \
--enable-aescfb \
--enable-camellia \
--enable-curve25519 \
--enable-curve448 \