Upgrade libtomcrypt
This commit is contained in:
@@ -57,12 +57,12 @@ int cfb_decrypt(const unsigned char *ct, unsigned char *pt, unsigned long len, s
|
||||
return CRYPT_OVERFLOW;
|
||||
}
|
||||
|
||||
if ((err = cipher_is_valid(cfb->cipher)) != CRYPT_OK) {
|
||||
if ((err = cipher_is_valid(cfb->ecb.cipher)) != CRYPT_OK) {
|
||||
return err;
|
||||
}
|
||||
|
||||
/* is blocklen/padlen valid? */
|
||||
if (cfb->blocklen < 0 || cfb->blocklen > (int)sizeof(cfb->IV) ||
|
||||
if (cfb->ecb.blocklen < 0 || cfb->ecb.blocklen > (int)sizeof(cfb->IV) ||
|
||||
cfb->padlen < 0 || cfb->padlen > (int)sizeof(cfb->pad)) {
|
||||
return CRYPT_INVALID_ARG;
|
||||
}
|
||||
@@ -70,8 +70,8 @@ int cfb_decrypt(const unsigned char *ct, unsigned char *pt, unsigned long len, s
|
||||
bits_per_round = cfb->width == 1 ? 1 : 8;
|
||||
|
||||
while (bitlen > 0) {
|
||||
if (cfb->padlen == cfb->blocklen) {
|
||||
if ((err = cipher_descriptor[cfb->cipher].ecb_encrypt(cfb->pad, cfb->IV, &cfb->key)) != CRYPT_OK) {
|
||||
if (cfb->padlen == cfb->ecb.blocklen) {
|
||||
if ((err = ecb_encrypt_block(cfb->pad, cfb->IV, &cfb->ecb)) != CRYPT_OK) {
|
||||
return err;
|
||||
}
|
||||
cfb->padlen = 0;
|
||||
@@ -85,22 +85,22 @@ int cfb_decrypt(const unsigned char *ct, unsigned char *pt, unsigned long len, s
|
||||
ct_ <<= 1;
|
||||
pt_ <<= 1;
|
||||
}
|
||||
if (cfb->blocklen == 16)
|
||||
if (cfb->ecb.blocklen == 16)
|
||||
s_shift1left_128(cfb->pad, ct_ >> 7);
|
||||
else
|
||||
s_shift1left_64(cfb->pad, ct_ >> 7);
|
||||
pt_ |= ((ct_ ^ cfb->IV[0]) >> 7) & 0x01u;
|
||||
cfb->padlen = cfb->blocklen;
|
||||
cfb->padlen = cfb->ecb.blocklen;
|
||||
if (cur_bit % 8 == 0) {
|
||||
*pt++ = pt_;
|
||||
cur_bit = 0;
|
||||
}
|
||||
break;
|
||||
case 8:
|
||||
XMEMMOVE(cfb->pad, cfb->pad + 1, cfb->blocklen - 1);
|
||||
cfb->pad[cfb->blocklen - 1] = *ct;
|
||||
XMEMMOVE(cfb->pad, cfb->pad + 1, cfb->ecb.blocklen - 1);
|
||||
cfb->pad[cfb->ecb.blocklen - 1] = *ct;
|
||||
*pt++ = *ct++ ^ cfb->IV[0];
|
||||
cfb->padlen = cfb->blocklen;
|
||||
cfb->padlen = cfb->ecb.blocklen;
|
||||
break;
|
||||
case 64:
|
||||
case 128:
|
||||
|
||||
Reference in New Issue
Block a user