diff --git a/src/libstrongswan/plugins/aesni/aesni_ccm.c b/src/libstrongswan/plugins/aesni/aesni_ccm.c
index 12074860e..677256de2 100644
--- a/src/libstrongswan/plugins/aesni/aesni_ccm.c
+++ b/src/libstrongswan/plugins/aesni/aesni_ccm.c
@@ -860,15 +860,12 @@ aesni_ccm_t *aesni_ccm_create(encryption_algorithm_t algo,
 	switch (algo)
 	{
 		case ENCR_AES_CCM_ICV8:
-			algo = ENCR_AES_CBC;
 			icv_size = 8;
 			break;
 		case ENCR_AES_CCM_ICV12:
-			algo = ENCR_AES_CBC;
 			icv_size = 12;
 			break;
 		case ENCR_AES_CCM_ICV16:
-			algo = ENCR_AES_CBC;
 			icv_size = 16;
 			break;
 		default:
diff --git a/src/libstrongswan/plugins/aesni/aesni_gcm.c b/src/libstrongswan/plugins/aesni/aesni_gcm.c
index 330dc6cd3..6fe053134 100644
--- a/src/libstrongswan/plugins/aesni/aesni_gcm.c
+++ b/src/libstrongswan/plugins/aesni/aesni_gcm.c
@@ -1393,15 +1393,12 @@ aesni_gcm_t *aesni_gcm_create(encryption_algorithm_t algo,
 	switch (algo)
 	{
 		case ENCR_AES_GCM_ICV8:
-			algo = ENCR_AES_CBC;
 			icv_size = 8;
 			break;
 		case ENCR_AES_GCM_ICV12:
-			algo = ENCR_AES_CBC;
 			icv_size = 12;
 			break;
 		case ENCR_AES_GCM_ICV16:
-			algo = ENCR_AES_CBC;
 			icv_size = 16;
 			break;
 		default: