octoleo
/
qpdf
mirror of https://github.com/qpdf/qpdf.git
2
1
Fork 0
Code Issues Releases Wiki Activity

Format code

This commit is contained in:
Jay Berkenbilt 2023-07-09 09:59:55 -04:00
parent 2dc2633872
commit 3f9b5053ba
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libqpdf/QPDF.cc
View File

@ -1285,7 +1285,6 @@ QPDF::readTrailer()
return object; return object;
} }
QPDFObjectHandle QPDFObjectHandle
QPDF::readObject(std::string const& description, QPDFObjGen og) QPDF::readObject(std::string const& description, QPDFObjGen og)
{ {

20
libqpdf/rijndael.cc
View File

@ -848,9 +848,9 @@ void rijndaelEncrypt(const u32 *rk, unsigned int nrounds,
u8 ciphertext[16]) u8 ciphertext[16])
{ {
u32 s0, s1, s2, s3, t0, t1, t2, t3; u32 s0, s1, s2, s3, t0, t1, t2, t3;
#ifndef FULL_UNROLL #ifndef FULL_UNROLL
int r; int r;
#endif /* ?FULL_UNROLL */ #endif /* ?FULL_UNROLL */
/* /*
* map byte array block to cipher state * map byte array block to cipher state
* and add initial round key: * and add initial round key:
@ -859,7 +859,7 @@ void rijndaelEncrypt(const u32 *rk, unsigned int nrounds,
s1 = GETU32(plaintext + 4) ^ rk[1]; s1 = GETU32(plaintext + 4) ^ rk[1];
s2 = GETU32(plaintext + 8) ^ rk[2]; s2 = GETU32(plaintext + 8) ^ rk[2];
s3 = GETU32(plaintext + 12) ^ rk[3]; s3 = GETU32(plaintext + 12) ^ rk[3];
#ifdef FULL_UNROLL #ifdef FULL_UNROLL
/* round 1: */ /* round 1: */
t0 = Te0[s0 >> 24] ^ Te1[(s1 >> 16) & 0xff] ^ Te2[(s2 >> 8) & 0xff] ^ Te3[s3 & 0xff] ^ rk[ 4]; t0 = Te0[s0 >> 24] ^ Te1[(s1 >> 16) & 0xff] ^ Te2[(s2 >> 8) & 0xff] ^ Te3[s3 & 0xff] ^ rk[ 4];
t1 = Te0[s1 >> 24] ^ Te1[(s2 >> 16) & 0xff] ^ Te2[(s3 >> 8) & 0xff] ^ Te3[s0 & 0xff] ^ rk[ 5]; t1 = Te0[s1 >> 24] ^ Te1[(s2 >> 16) & 0xff] ^ Te2[(s3 >> 8) & 0xff] ^ Te3[s0 & 0xff] ^ rk[ 5];
@ -932,7 +932,7 @@ void rijndaelEncrypt(const u32 *rk, unsigned int nrounds,
} }
} }
rk += nrounds << 2; rk += nrounds << 2;
#else /* !FULL_UNROLL */ #else /* !FULL_UNROLL */
/* /*
* nrounds - 1 full rounds: * nrounds - 1 full rounds:
*/ */
@ -991,7 +991,7 @@ void rijndaelEncrypt(const u32 *rk, unsigned int nrounds,
Te3[(t2 ) & 0xff] ^ Te3[(t2 ) & 0xff] ^
rk[3]; rk[3];
} }
#endif /* ?FULL_UNROLL */ #endif /* ?FULL_UNROLL */
/* /*
* apply last round and * apply last round and
* map cipher state to byte array block: * map cipher state to byte array block:
@ -1031,9 +1031,9 @@ void rijndaelDecrypt(const u32 *rk, unsigned int nrounds,
u8 plaintext[16]) u8 plaintext[16])
{ {
u32 s0, s1, s2, s3, t0, t1, t2, t3; u32 s0, s1, s2, s3, t0, t1, t2, t3;
#ifndef FULL_UNROLL #ifndef FULL_UNROLL
int r; int r;
#endif /* ?FULL_UNROLL */ #endif /* ?FULL_UNROLL */
/* /*
* map byte array block to cipher state * map byte array block to cipher state
@ -1043,7 +1043,7 @@ void rijndaelDecrypt(const u32 *rk, unsigned int nrounds,
s1 = GETU32(ciphertext + 4) ^ rk[1]; s1 = GETU32(ciphertext + 4) ^ rk[1];
s2 = GETU32(ciphertext + 8) ^ rk[2]; s2 = GETU32(ciphertext + 8) ^ rk[2];
s3 = GETU32(ciphertext + 12) ^ rk[3]; s3 = GETU32(ciphertext + 12) ^ rk[3];
#ifdef FULL_UNROLL #ifdef FULL_UNROLL
/* round 1: */ /* round 1: */
t0 = Td0[s0 >> 24] ^ Td1[(s3 >> 16) & 0xff] ^ Td2[(s2 >> 8) & 0xff] ^ Td3[s1 & 0xff] ^ rk[ 4]; t0 = Td0[s0 >> 24] ^ Td1[(s3 >> 16) & 0xff] ^ Td2[(s2 >> 8) & 0xff] ^ Td3[s1 & 0xff] ^ rk[ 4];
t1 = Td0[s1 >> 24] ^ Td1[(s0 >> 16) & 0xff] ^ Td2[(s3 >> 8) & 0xff] ^ Td3[s2 & 0xff] ^ rk[ 5]; t1 = Td0[s1 >> 24] ^ Td1[(s0 >> 16) & 0xff] ^ Td2[(s3 >> 8) & 0xff] ^ Td3[s2 & 0xff] ^ rk[ 5];
@ -1116,7 +1116,7 @@ void rijndaelDecrypt(const u32 *rk, unsigned int nrounds,
} }
} }
rk += nrounds << 2; rk += nrounds << 2;
#else /* !FULL_UNROLL */ #else /* !FULL_UNROLL */
/* /*
* nrounds - 1 full rounds: * nrounds - 1 full rounds:
*/ */
@ -1175,7 +1175,7 @@ void rijndaelDecrypt(const u32 *rk, unsigned int nrounds,
Td3[(t0 ) & 0xff] ^ Td3[(t0 ) & 0xff] ^
rk[3]; rk[3];
} }
#endif /* ?FULL_UNROLL */ #endif /* ?FULL_UNROLL */
/* /*
* apply last round and * apply last round and
* map cipher state to byte array block: * map cipher state to byte array block: