Skip to content

Commit 1e2fb8f

Browse files
anhuanhu
committed
Fixup places where it should be CCM instead of GCM.
Fixes #7216
1 parent 8ba96e6 commit 1e2fb8f

2 files changed

Lines changed: 18 additions & 16 deletions

File tree

‎src/keys.c‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -672,7 +672,7 @@ int GetCipherSpec(word16 side, byte cipherSuite0, byte cipherSuite,
672672
specs->static_ecdh = 0;
673673
specs->key_size = AES_128_KEY_SIZE;
674674
specs->block_size = AES_BLOCK_SIZE;
675-
specs->iv_size = AESGCM_IMP_IV_SZ;
675+
specs->iv_size = AESCCM_IMP_IV_SZ;
676676
specs->aead_mac_size = AES_CCM_16_AUTH_SZ;
677677

678678
break;
@@ -690,7 +690,7 @@ int GetCipherSpec(word16 side, byte cipherSuite0, byte cipherSuite,
690690
specs->static_ecdh = 0;
691691
specs->key_size = AES_128_KEY_SIZE;
692692
specs->block_size = AES_BLOCK_SIZE;
693-
specs->iv_size = AESGCM_IMP_IV_SZ;
693+
specs->iv_size = AESCCM_IMP_IV_SZ;
694694
specs->aead_mac_size = AES_CCM_8_AUTH_SZ;
695695

696696
break;
@@ -708,7 +708,7 @@ int GetCipherSpec(word16 side, byte cipherSuite0, byte cipherSuite,
708708
specs->static_ecdh = 0;
709709
specs->key_size = AES_256_KEY_SIZE;
710710
specs->block_size = AES_BLOCK_SIZE;
711-
specs->iv_size = AESGCM_IMP_IV_SZ;
711+
specs->iv_size = AESCCM_IMP_IV_SZ;
712712
specs->aead_mac_size = AES_CCM_8_AUTH_SZ;
713713

714714
break;
@@ -1069,7 +1069,7 @@ int GetCipherSpec(word16 side, byte cipherSuite0, byte cipherSuite,
10691069
specs->static_ecdh = 0;
10701070
specs->key_size = AES_128_KEY_SIZE;
10711071
specs->block_size = AES_BLOCK_SIZE;
1072-
specs->iv_size = AESGCM_IMP_IV_SZ;
1072+
specs->iv_size = AESCCM_IMP_IV_SZ;
10731073
specs->aead_mac_size = AES_CCM_8_AUTH_SZ;
10741074

10751075
break;
@@ -1087,7 +1087,7 @@ int GetCipherSpec(word16 side, byte cipherSuite0, byte cipherSuite,
10871087
specs->static_ecdh = 0;
10881088
specs->key_size = AES_256_KEY_SIZE;
10891089
specs->block_size = AES_BLOCK_SIZE;
1090-
specs->iv_size = AESGCM_IMP_IV_SZ;
1090+
specs->iv_size = AESCCM_IMP_IV_SZ;
10911091
specs->aead_mac_size = AES_CCM_8_AUTH_SZ;
10921092

10931093
break;
@@ -1105,7 +1105,7 @@ int GetCipherSpec(word16 side, byte cipherSuite0, byte cipherSuite,
11051105
specs->static_ecdh = 0;
11061106
specs->key_size = AES_128_KEY_SIZE;
11071107
specs->block_size = AES_BLOCK_SIZE;
1108-
specs->iv_size = AESGCM_IMP_IV_SZ;
1108+
specs->iv_size = AESCCM_IMP_IV_SZ;
11091109
specs->aead_mac_size = AES_CCM_8_AUTH_SZ;
11101110

11111111
if (opts != NULL)
@@ -1125,7 +1125,7 @@ int GetCipherSpec(word16 side, byte cipherSuite0, byte cipherSuite,
11251125
specs->static_ecdh = 0;
11261126
specs->key_size = AES_256_KEY_SIZE;
11271127
specs->block_size = AES_BLOCK_SIZE;
1128-
specs->iv_size = AESGCM_IMP_IV_SZ;
1128+
specs->iv_size = AESCCM_IMP_IV_SZ;
11291129
specs->aead_mac_size = AES_CCM_8_AUTH_SZ;
11301130

11311131
if (opts != NULL)
@@ -1145,7 +1145,7 @@ int GetCipherSpec(word16 side, byte cipherSuite0, byte cipherSuite,
11451145
specs->static_ecdh = 0;
11461146
specs->key_size = AES_128_KEY_SIZE;
11471147
specs->block_size = AES_BLOCK_SIZE;
1148-
specs->iv_size = AESGCM_IMP_IV_SZ;
1148+
specs->iv_size = AESCCM_IMP_IV_SZ;
11491149
specs->aead_mac_size = AES_CCM_16_AUTH_SZ;
11501150

11511151
if (opts != NULL)
@@ -1165,7 +1165,7 @@ int GetCipherSpec(word16 side, byte cipherSuite0, byte cipherSuite,
11651165
specs->static_ecdh = 0;
11661166
specs->key_size = AES_256_KEY_SIZE;
11671167
specs->block_size = AES_BLOCK_SIZE;
1168-
specs->iv_size = AESGCM_IMP_IV_SZ;
1168+
specs->iv_size = AESCCM_IMP_IV_SZ;
11691169
specs->aead_mac_size = AES_CCM_16_AUTH_SZ;
11701170

11711171
if (opts != NULL)
@@ -1185,7 +1185,7 @@ int GetCipherSpec(word16 side, byte cipherSuite0, byte cipherSuite,
11851185
specs->static_ecdh = 0;
11861186
specs->key_size = AES_128_KEY_SIZE;
11871187
specs->block_size = AES_BLOCK_SIZE;
1188-
specs->iv_size = AESGCM_IMP_IV_SZ;
1188+
specs->iv_size = AESCCM_IMP_IV_SZ;
11891189
specs->aead_mac_size = AES_CCM_16_AUTH_SZ;
11901190

11911191
if (opts != NULL)
@@ -1205,7 +1205,7 @@ int GetCipherSpec(word16 side, byte cipherSuite0, byte cipherSuite,
12051205
specs->static_ecdh = 0;
12061206
specs->key_size = AES_256_KEY_SIZE;
12071207
specs->block_size = AES_BLOCK_SIZE;
1208-
specs->iv_size = AESGCM_IMP_IV_SZ;
1208+
specs->iv_size = AESCCM_IMP_IV_SZ;
12091209
specs->aead_mac_size = AES_CCM_16_AUTH_SZ;
12101210

12111211
if (opts != NULL)
@@ -1330,7 +1330,7 @@ int GetCipherSpec(word16 side, byte cipherSuite0, byte cipherSuite,
13301330
specs->static_ecdh = 0;
13311331
specs->key_size = AES_128_KEY_SIZE;
13321332
specs->block_size = AES_BLOCK_SIZE;
1333-
specs->iv_size = AESGCM_NONCE_SZ;
1333+
specs->iv_size = AESCCM_NONCE_SZ;
13341334
specs->aead_mac_size = AES_CCM_16_AUTH_SZ;
13351335

13361336
break;
@@ -1348,7 +1348,7 @@ int GetCipherSpec(word16 side, byte cipherSuite0, byte cipherSuite,
13481348
specs->static_ecdh = 0;
13491349
specs->key_size = AES_128_KEY_SIZE;
13501350
specs->block_size = AES_BLOCK_SIZE;
1351-
specs->iv_size = AESGCM_NONCE_SZ;
1351+
specs->iv_size = AESCCM_NONCE_SZ;
13521352
specs->aead_mac_size = AES_CCM_8_AUTH_SZ;
13531353

13541354
break;
@@ -1440,7 +1440,7 @@ int GetCipherSpec(word16 side, byte cipherSuite0, byte cipherSuite,
14401440
specs->static_ecdh = 0;
14411441
specs->key_size = SM4_KEY_SIZE;
14421442
specs->block_size = SM4_BLOCK_SIZE;
1443-
specs->iv_size = GCM_IMP_IV_SZ;
1443+
specs->iv_size = CCM_IMP_IV_SZ;
14441444
specs->aead_mac_size = SM4_CCM_AUTH_SZ;
14451445

14461446
break;

‎wolfssl/internal.h‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1731,10 +1731,12 @@ enum Misc {
17311731
AEAD_LEN_OFFSET = 11, /* Auth Data: Length */
17321732
AEAD_AUTH_DATA_SZ = 13, /* Size of the data to authenticate */
17331733
AEAD_NONCE_SZ = 12,
1734-
AESGCM_IMP_IV_SZ = 4, /* Size of GCM/CCM AEAD implicit IV */
1734+
AESGCM_IMP_IV_SZ = 4, /* Size of GCM AEAD implicit IV */
1735+
AESCCM_IMP_IV_SZ = 4, /* Size of CCM AEAD implicit IV */
17351736
AESGCM_EXP_IV_SZ = 8, /* Size of GCM/CCM AEAD explicit IV */
17361737
AESGCM_NONCE_SZ = AESGCM_EXP_IV_SZ + AESGCM_IMP_IV_SZ,
1737-
GCM_IMP_IV_SZ = 4, /* Size of GCM/CCM AEAD implicit IV */
1738+
GCM_IMP_IV_SZ = 4, /* Size of GCM AEAD implicit IV */
1739+
CCM_IMP_IV_SZ = 4, /* Size of CCM AEAD implicit IV */
17381740
GCM_EXP_IV_SZ = 8, /* Size of GCM/CCM AEAD explicit IV */
17391741
GCM_NONCE_SZ = GCM_EXP_IV_SZ + GCM_IMP_IV_SZ,
17401742

0 commit comments

Comments
 (0)