#260 following, reuse test class

galkahana · Jun 22, 2024 · 6171b23 · 6171b23
1 parent b991cb7
commit 6171b23
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 64 deletions.
diff --git a/PDFWriter/DecryptionHelper.cpp b/PDFWriter/DecryptionHelper.cpp
@@ -73,7 +73,7 @@ void DecryptionHelper::Reset() {
 	Release();
 }
 
-unsigned int ComputeLength(PDFObject* inLengthObject) {
+unsigned int ComputeByteLength(PDFObject* inLengthObject) {
 	// The bit length of the file encryption key shall be a multiple of 8 in the range of 40 to 256 bits. This function returns the length in bytes.
 	ParsedPrimitiveHelper lengthHelper(inLengthObject);
 	unsigned int value = lengthHelper.IsNumber() ? (unsigned int)lengthHelper.GetAsInteger() : 40;
@@ -195,7 +195,7 @@ EStatusCode DecryptionHelper::Setup(PDFParser* inParser, const string& inPasswor
 			mLength = 40 / 8;
 		}
 		else {
-			mLength = ComputeLength(length.GetPtr());
+			mLength = ComputeByteLength(length.GetPtr());
 		}
 
 		// Setup crypt filters, or a default filter
@@ -216,7 +216,7 @@ EStatusCode DecryptionHelper::Setup(PDFParser* inParser, const string& inPasswor
 					if (!!cryptFilter) {
 						PDFObjectCastPtr<PDFName> cfmName(inParser->QueryDictionaryObject(cryptFilter.GetPtr(), "CFM"));
 						RefCountPtr<PDFObject> lengthObject(inParser->QueryDictionaryObject(cryptFilter.GetPtr(), "Length"));
-						unsigned int length = !lengthObject ? mLength : ComputeLength(lengthObject.GetPtr());
+						unsigned int length = !lengthObject ? mLength : ComputeByteLength(lengthObject.GetPtr());
 
 						XCryptionCommon* encryption = new XCryptionCommon();
 						encryption->Setup(cfmName->GetValue() == "AESV2"); // singe xcryptions are always RC4

diff --git a/PDFWriterTesting/CMakeLists.txt b/PDFWriterTesting/CMakeLists.txt
@@ -54,7 +54,6 @@ create_test_sourcelist (Tests
   PDFObjectParserTest.cpp
   PDFParserFuzzSanity.cpp
   PDFParserTest.cpp
-  PDFParserInvalidLengthTest.cpp
   PDFWithPassword.cpp
   PFBStreamTest.cpp
   PNGImageTest.cpp

diff --git a/...ing/Materials/InvalidEncryptionLength.pdf → ...rials/fuzzing/InvalidEncryptionLength.pdf b/...ing/Materials/InvalidEncryptionLength.pdf → ...rials/fuzzing/InvalidEncryptionLength.pdf
diff --git a/PDFWriterTesting/PDFParserInvalidLengthTest.cpp b/PDFWriterTesting/PDFParserInvalidLengthTest.cpp