xiaoxiang781216 commented on code in PR #18608:
URL: https://github.com/apache/nuttx/pull/18608#discussion_r2998556787
##########
crypto/cryptosoft.c:
##########
@@ -2090,6 +2101,71 @@ int swcr_process(struct cryptop *crp)
return 0;
}
+int swcr_pbkdf2(FAR struct cryptop *crp,
+ FAR struct cryptodesc *crd,
+ FAR struct swcr_data *swd,
+ caddr_t buf)
+{
+ uint8_t U[64];
+ uint8_t T[64];
+ uint8_t macbuf[64];
+ uint8_t ictx[256];
+ struct cryptop crp_dummy;
+ struct cryptodesc crd_dummy;
+
+ size_t generated = 0;
+ uint32_t blocknum;
+ uint32_t i;
+ uint32_t j;
+
+ crp_dummy.crp_mac = (caddr_t)macbuf;
+
+ for (blocknum = 1; generated < crp->crp_olen; blocknum++)
+ {
+ uint8_t saltblk[crp->crp_ilen + 4];
+
+ memcpy(saltblk, crp->crp_buf, crp->crp_ilen);
+ *(uint32_t *)(saltblk + crp->crp_ilen) = htobe32(blocknum);
Review Comment:
```suggestion
*(FAR uint32_t *)(saltblk + crp->crp_ilen) = htobe32(blocknum);
```
##########
crypto/cryptosoft.c:
##########
@@ -2090,6 +2101,71 @@ int swcr_process(struct cryptop *crp)
return 0;
}
+int swcr_pbkdf2(FAR struct cryptop *crp,
+ FAR struct cryptodesc *crd,
+ FAR struct swcr_data *swd,
+ caddr_t buf)
+{
+ uint8_t U[64];
+ uint8_t T[64];
+ uint8_t macbuf[64];
+ uint8_t ictx[256];
+ struct cryptop crp_dummy;
+ struct cryptodesc crd_dummy;
+
+ size_t generated = 0;
+ uint32_t blocknum;
+ uint32_t i;
+ uint32_t j;
+
+ crp_dummy.crp_mac = (caddr_t)macbuf;
+
+ for (blocknum = 1; generated < crp->crp_olen; blocknum++)
+ {
+ uint8_t saltblk[crp->crp_ilen + 4];
+
+ memcpy(saltblk, crp->crp_buf, crp->crp_ilen);
+ *(uint32_t *)(saltblk + crp->crp_ilen) = htobe32(blocknum);
+
+ memcpy(ictx, swd->sw_ictx, swd->sw_axf->ctxsize);
+ memcpy(&swd->sw_ctx, ictx, swd->sw_axf->ctxsize);
+
+ crd_dummy.crd_skip = 0;
+ crd_dummy.crd_flags = 0;
+
+ /* U1 */
+
+ crd_dummy.crd_len = crp->crp_ilen + 4;
+ swcr_authcompute(&crp_dummy, &crd_dummy, swd, (caddr_t)saltblk);
+
+ memcpy(U, macbuf, swd->sw_axf->hashsize);
+ memcpy(T, U, swd->sw_axf->hashsize);
+
+ /* U2..Uc */
+
+ for (i = 1; i < crp->crp_iter; i++)
+ {
+ memcpy(&swd->sw_ctx, ictx, swd->sw_axf->ctxsize);
+
+ crd_dummy.crd_len = swd->sw_axf->hashsize;
+ swcr_authcompute(&crp_dummy, &crd_dummy, swd, (caddr_t)U);
+
+ memcpy(U, macbuf, swd->sw_axf->hashsize);
+
+ for (j = 0; j < swd->sw_axf->hashsize; j++)
+ T[j] ^= U[j];
Review Comment:
add {}
##########
boards/xtensa/esp32/esp32-devkitc/configs/crypto/defconfig:
##########
@@ -44,6 +44,7 @@ CONFIG_NSH_BUILTIN_APPS=y
CONFIG_NSH_FILEIOSIZE=512
CONFIG_NSH_READLINE=y
CONFIG_NSH_STRERROR=y
+CONFIG_TESTING_CRYPTO_PBKDF2=y
Review Comment:
need keep the order
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
