Upgrade libtomcrypt
This commit is contained in:
@@ -24,12 +24,12 @@ int f8_encrypt(const unsigned char *pt, unsigned char *ct, unsigned long len, sy
|
||||
LTC_ARGCHK(pt != NULL);
|
||||
LTC_ARGCHK(ct != NULL);
|
||||
LTC_ARGCHK(f8 != NULL);
|
||||
if ((err = cipher_is_valid(f8->cipher)) != CRYPT_OK) {
|
||||
if ((err = cipher_is_valid(f8->ecb.cipher)) != CRYPT_OK) {
|
||||
return err;
|
||||
}
|
||||
|
||||
/* is blocklen/padlen valid? */
|
||||
if (f8->blocklen < 0 || f8->blocklen > (int)sizeof(f8->IV) ||
|
||||
if (f8->ecb.blocklen < 0 || f8->ecb.blocklen > (int)sizeof(f8->IV) ||
|
||||
f8->padlen < 0 || f8->padlen > (int)sizeof(f8->IV)) {
|
||||
return CRYPT_INVALID_ARG;
|
||||
}
|
||||
@@ -37,14 +37,14 @@ int f8_encrypt(const unsigned char *pt, unsigned char *ct, unsigned long len, sy
|
||||
zeromem(buf, sizeof(buf));
|
||||
|
||||
/* make sure the pad is empty */
|
||||
if (f8->padlen == f8->blocklen) {
|
||||
if (f8->padlen == f8->ecb.blocklen) {
|
||||
/* xor of IV, MIV and blockcnt == what goes into cipher */
|
||||
STORE32H(f8->blockcnt, (buf+(f8->blocklen-4)));
|
||||
STORE32H(f8->blockcnt, (buf+(f8->ecb.blocklen-4)));
|
||||
++(f8->blockcnt);
|
||||
for (x = 0; x < f8->blocklen; x++) {
|
||||
for (x = 0; x < f8->ecb.blocklen; x++) {
|
||||
f8->IV[x] ^= f8->MIV[x] ^ buf[x];
|
||||
}
|
||||
if ((err = cipher_descriptor[f8->cipher].ecb_encrypt(f8->IV, f8->IV, &f8->key)) != CRYPT_OK) {
|
||||
if ((err = ecb_encrypt_block(f8->IV, f8->IV, &f8->ecb)) != CRYPT_OK) {
|
||||
return err;
|
||||
}
|
||||
f8->padlen = 0;
|
||||
@@ -52,14 +52,14 @@ int f8_encrypt(const unsigned char *pt, unsigned char *ct, unsigned long len, sy
|
||||
|
||||
#ifdef LTC_FAST
|
||||
if (f8->padlen == 0) {
|
||||
while (len >= (unsigned long)f8->blocklen) {
|
||||
STORE32H(f8->blockcnt, (buf+(f8->blocklen-4)));
|
||||
while (len >= (unsigned long)f8->ecb.blocklen) {
|
||||
STORE32H(f8->blockcnt, (buf+(f8->ecb.blocklen-4)));
|
||||
++(f8->blockcnt);
|
||||
for (x = 0; x < f8->blocklen; x += sizeof(LTC_FAST_TYPE)) {
|
||||
for (x = 0; x < f8->ecb.blocklen; x += sizeof(LTC_FAST_TYPE)) {
|
||||
*(LTC_FAST_TYPE_PTR_CAST(&ct[x])) = *(LTC_FAST_TYPE_PTR_CAST(&pt[x])) ^ *(LTC_FAST_TYPE_PTR_CAST(&f8->IV[x]));
|
||||
*(LTC_FAST_TYPE_PTR_CAST(&f8->IV[x])) ^= *(LTC_FAST_TYPE_PTR_CAST(&f8->MIV[x])) ^ *(LTC_FAST_TYPE_PTR_CAST(&buf[x]));
|
||||
}
|
||||
if ((err = cipher_descriptor[f8->cipher].ecb_encrypt(f8->IV, f8->IV, &f8->key)) != CRYPT_OK) {
|
||||
if ((err = ecb_encrypt_block(f8->IV, f8->IV, &f8->ecb)) != CRYPT_OK) {
|
||||
return err;
|
||||
}
|
||||
len -= x;
|
||||
@@ -70,14 +70,14 @@ int f8_encrypt(const unsigned char *pt, unsigned char *ct, unsigned long len, sy
|
||||
#endif
|
||||
|
||||
while (len > 0) {
|
||||
if (f8->padlen == f8->blocklen) {
|
||||
if (f8->padlen == f8->ecb.blocklen) {
|
||||
/* xor of IV, MIV and blockcnt == what goes into cipher */
|
||||
STORE32H(f8->blockcnt, (buf+(f8->blocklen-4)));
|
||||
STORE32H(f8->blockcnt, (buf+(f8->ecb.blocklen-4)));
|
||||
++(f8->blockcnt);
|
||||
for (x = 0; x < f8->blocklen; x++) {
|
||||
for (x = 0; x < f8->ecb.blocklen; x++) {
|
||||
f8->IV[x] ^= f8->MIV[x] ^ buf[x];
|
||||
}
|
||||
if ((err = cipher_descriptor[f8->cipher].ecb_encrypt(f8->IV, f8->IV, &f8->key)) != CRYPT_OK) {
|
||||
if ((err = ecb_encrypt_block(f8->IV, f8->IV, &f8->ecb)) != CRYPT_OK) {
|
||||
return err;
|
||||
}
|
||||
f8->padlen = 0;
|
||||
|
||||
Reference in New Issue
Block a user