Merge pull request #661 from libtom/fix-ccm

sjaeckel · web-flow · commit 12bf723b7400 · 2024-08-29T22:37:17.000+02:00
Fix compiler warning
diff --git a/src/encauth/ccm/ccm_add_nonce.c b/src/encauth/ccm/ccm_add_nonce.c
@@ -58,6 +58,9 @@ int ccm_add_nonce(ccm_state *ccm,
       ccm->PAD[x++] = 0;
    }
    for (; y < ccm->L; y++) {
+      if (x >= sizeof(ccm->PAD)) {
+         return CRYPT_INVALID_ARG;
+      }
       ccm->PAD[x++] = (unsigned char)((len >> 24) & 255);
       len <<= 8;
    }

Original file line number	Diff line number	Diff line change
`@@ -58,6 +58,9 @@ int ccm_add_nonce(ccm_state *ccm,`
`58`	`58`	`ccm->PAD[x++] = 0;`
`59`	`59`	`}`
`60`	`60`	`for (; y < ccm->L; y++) {`
	`61`	`+ if (x >= sizeof(ccm->PAD)) {`
	`62`	`+ return CRYPT_INVALID_ARG;`
	`63`	`+ }`
`61`	`64`	`ccm->PAD[x++] = (unsigned char)((len >> 24) & 255);`
`62`	`65`	`len <<= 8;`
`63`	`66`	`}`