diff --git a/poppler/DecryptStream.cc b/poppler/DecryptStream.cc index 38df14a7c254b1015c5a7942e5b65a734d5f72c5..592800f6e244fc347416a437b8e74fd05ae39aee 100644 --- a/poppler/DecryptStream.cc +++ b/poppler/DecryptStream.cc @@ -130,8 +130,8 @@ void aesEncryptArray(const unsigned char *IV, //------------------------------------------------------------------------ EncryptStream::EncryptStream(Stream *strA, const unsigned char *fileKey, CryptAlgorithm algoA, - int keyLength, int objNum, int objGen): - BaseCryptStream(strA, fileKey, algoA, keyLength, objNum, objGen) + int keyLength, Ref refA): + BaseCryptStream(strA, fileKey, algoA, keyLength, refA) { // Fill the CBC initialization vector for AES and AES-256 switch (algo) { @@ -222,8 +222,8 @@ int EncryptStream::lookChar() { //------------------------------------------------------------------------ DecryptStream::DecryptStream(Stream *strA, const unsigned char *fileKey, CryptAlgorithm algoA, - int keyLength, int objNum, int objGen): - BaseCryptStream(strA, fileKey, algoA, keyLength, objNum, objGen) + int keyLength, Ref refA): + BaseCryptStream(strA, fileKey, algoA, keyLength, refA) { } diff --git a/poppler/DecryptStream.h b/poppler/DecryptStream.h index 018030dd1dbd156d7595f29e1f58c176299e32fb..90ba0b8a007ac91e67d6d78a757387a2995ace7d 100644 --- a/poppler/DecryptStream.h +++ b/poppler/DecryptStream.h @@ -101,7 +101,7 @@ class EncryptStream : public BaseCryptStream { public: EncryptStream(Stream *strA, const unsigned char *fileKey, CryptAlgorithm algoA, - int keyLength, int objNum, int objGen); + int keyLength, Ref ref); ~EncryptStream(); void reset() override; int lookChar() override; @@ -119,7 +119,7 @@ class DecryptStream : public BaseCryptStream { public: DecryptStream(Stream *strA, const unsigned char *fileKey, CryptAlgorithm algoA, - int keyLength, int objNum, int objGen); + int keyLength, Ref ref); ~DecryptStream(); void reset() override; int lookChar() override; diff --git a/poppler/DecryptStreamNSS.cc b/poppler/DecryptStreamNSS.cc index e8c4bf98a68200a4cfc471e4ebff6a5be51d472e..049bb4b05e3e2aa3a05b420f6ddd36e6962ea102 100644 --- a/poppler/DecryptStreamNSS.cc +++ b/poppler/DecryptStreamNSS.cc @@ -107,8 +107,8 @@ void aesEncryptArray(const unsigned char *IV, //------------------------------------------------------------------------ EncryptStream::EncryptStream(Stream *strA, const unsigned char *fileKey, CryptAlgorithm algoA, - int keyLength, int objNum, int objGen): - BaseCryptStream(strA, fileKey, algoA, keyLength, objNum, objGen) + int keyLength, Ref refA): + BaseCryptStream(strA, fileKey, algoA, keyLength, refA) { // Fill the CBC initialization vector for AES and AES-256 if (algo == cryptAES || algo == cryptAES256) @@ -207,8 +207,8 @@ int EncryptStream::lookChar() { //------------------------------------------------------------------------ DecryptStream::DecryptStream(Stream *strA, const unsigned char *fileKey, CryptAlgorithm algoA, - int keyLength, int objNum, int objGen): - BaseCryptStream(strA, fileKey, algoA, keyLength, objNum, objGen) + int keyLength, Ref refA): + BaseCryptStream(strA, fileKey, algoA, keyLength, refA) { switch (algo) { case cryptRC4: diff --git a/poppler/DecryptStreamNSS.h b/poppler/DecryptStreamNSS.h index 94d60d2cb9faaac91343e5d850da1415bc0352de..9731901382ff10396a486cfafccd9709132ea12e 100644 --- a/poppler/DecryptStreamNSS.h +++ b/poppler/DecryptStreamNSS.h @@ -95,7 +95,7 @@ class EncryptStream : public BaseCryptStream { public: EncryptStream(Stream *strA, const unsigned char *fileKey, CryptAlgorithm algoA, - int keyLength, int objNum, int objGen); + int keyLength, Ref ref); ~EncryptStream(); void reset() override; int lookChar() override; @@ -112,7 +112,7 @@ class DecryptStream : public BaseCryptStream { public: DecryptStream(Stream *strA, const unsigned char *fileKey, CryptAlgorithm algoA, - int keyLength, int objNum, int objGen); + int keyLength, Ref ref); ~DecryptStream(); void reset() override; int lookChar() override;