diff options
| author | Jay Berkenbilt <ejb@ql.org> | 2023-07-09 15:59:55 +0200 |
|---|---|---|
| committer | Jay Berkenbilt <ejb@ql.org> | 2023-07-09 15:59:55 +0200 |
| commit | 3f9b5053bae1a6d74e1f11fa004f26f1341a2979 (patch) | |
| tree | 0ee75dfe4f08592d70e5ae35181d75af68dabeeb | |
| parent | 2dc26338726a748ea23ccc7d07073c2bd17d7538 (diff) | |
| download | qpdf-3f9b5053bae1a6d74e1f11fa004f26f1341a2979.tar.zst | |
Format code
| -rw-r--r-- | libqpdf/QPDF.cc | 1 | ||||
| -rw-r--r-- | libqpdf/rijndael.cc | 20 |
2 files changed, 10 insertions, 11 deletions
diff --git a/libqpdf/QPDF.cc b/libqpdf/QPDF.cc index 7edb76f9..c5a7ab5d 100644 --- a/libqpdf/QPDF.cc +++ b/libqpdf/QPDF.cc @@ -1285,7 +1285,6 @@ QPDF::readTrailer() return object; } - QPDFObjectHandle QPDF::readObject(std::string const& description, QPDFObjGen og) { diff --git a/libqpdf/rijndael.cc b/libqpdf/rijndael.cc index 419c84f7..b9f07397 100644 --- a/libqpdf/rijndael.cc +++ b/libqpdf/rijndael.cc @@ -848,9 +848,9 @@ void rijndaelEncrypt(const u32 *rk, unsigned int nrounds, u8 ciphertext[16]) { u32 s0, s1, s2, s3, t0, t1, t2, t3; - #ifndef FULL_UNROLL +#ifndef FULL_UNROLL int r; - #endif /* ?FULL_UNROLL */ +#endif /* ?FULL_UNROLL */ /* * map byte array block to cipher state * and add initial round key: @@ -859,7 +859,7 @@ void rijndaelEncrypt(const u32 *rk, unsigned int nrounds, s1 = GETU32(plaintext + 4) ^ rk[1]; s2 = GETU32(plaintext + 8) ^ rk[2]; s3 = GETU32(plaintext + 12) ^ rk[3]; - #ifdef FULL_UNROLL +#ifdef FULL_UNROLL /* round 1: */ 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]; @@ -932,7 +932,7 @@ void rijndaelEncrypt(const u32 *rk, unsigned int nrounds, } } rk += nrounds << 2; - #else /* !FULL_UNROLL */ +#else /* !FULL_UNROLL */ /* * nrounds - 1 full rounds: */ @@ -991,7 +991,7 @@ void rijndaelEncrypt(const u32 *rk, unsigned int nrounds, Te3[(t2 ) & 0xff] ^ rk[3]; } - #endif /* ?FULL_UNROLL */ +#endif /* ?FULL_UNROLL */ /* * apply last round and * map cipher state to byte array block: @@ -1031,9 +1031,9 @@ void rijndaelDecrypt(const u32 *rk, unsigned int nrounds, u8 plaintext[16]) { u32 s0, s1, s2, s3, t0, t1, t2, t3; - #ifndef FULL_UNROLL +#ifndef FULL_UNROLL int r; - #endif /* ?FULL_UNROLL */ +#endif /* ?FULL_UNROLL */ /* * 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]; s2 = GETU32(ciphertext + 8) ^ rk[2]; s3 = GETU32(ciphertext + 12) ^ rk[3]; - #ifdef FULL_UNROLL +#ifdef FULL_UNROLL /* round 1: */ 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]; @@ -1116,7 +1116,7 @@ void rijndaelDecrypt(const u32 *rk, unsigned int nrounds, } } rk += nrounds << 2; - #else /* !FULL_UNROLL */ +#else /* !FULL_UNROLL */ /* * nrounds - 1 full rounds: */ @@ -1175,7 +1175,7 @@ void rijndaelDecrypt(const u32 *rk, unsigned int nrounds, Td3[(t0 ) & 0xff] ^ rk[3]; } - #endif /* ?FULL_UNROLL */ +#endif /* ?FULL_UNROLL */ /* * apply last round and * map cipher state to byte array block: |