From 5fd1e91ec162984d4dd0200cb20db5096b95c0f3 Mon Sep 17 00:00:00 2001
From: exiledkingcc <exiledkingcc@gmail.com>
Date: Sun, 23 Jul 2023 00:12:36 +0800
Subject: [PATCH 1/2] MAINT: simplify file identifiers generation

---
 pypdf/_writer.py | 49 +++++++++++++++++++++++++++---------------------
 1 file changed, 28 insertions(+), 21 deletions(-)

diff --git a/pypdf/_writer.py b/pypdf/_writer.py
index 1abb61566..df4ccbd86 100644
--- a/pypdf/_writer.py
+++ b/pypdf/_writer.py
@@ -33,6 +33,7 @@
 import enum
 import hashlib
 import re
+import time
 import uuid
 import warnings
 from io import BytesIO, FileIO, IOBase
@@ -136,13 +137,6 @@ class ObjectDeletionFlag(enum.IntFlag):
     ALL_ANNOTATIONS = enum.auto()
 
 
-def _rolling_checksum(stream: BytesIO, blocksize: int = 65536) -> str:
-    hash = hashlib.md5()
-    for block in iter(lambda: stream.read(blocksize), b""):
-        hash.update(block)
-    return hash.hexdigest()
-
-
 class PdfWriter:
     """
     Write a PDF file out, given pages produced by another class.
@@ -206,6 +200,7 @@ def __init__(
 
         self._encryption: Optional[Encryption] = None
         self._encrypt_entry: Optional[DictionaryObject] = None
+        self._ID: Union[ArrayObject, None] = None
 
     def __enter__(self) -> "PdfWriter":
         """Store that writer is initialized by 'with'."""
@@ -1128,25 +1123,35 @@ def cloneDocumentFromReader(
         )
         self.clone_document_from_reader(reader, after_page_append)
 
-    def _compute_document_identifier_from_content(self) -> ByteStringObject:
-        stream = BytesIO()
-        self._write_pdf_structure(stream)
-        stream.seek(0)
-        return ByteStringObject(_rolling_checksum(stream).encode("utf8"))
+    def _compute_document_identifier(self) -> ByteStringObject:
+        md5 = hashlib.md5()
+        md5.update(str(time.time()).encode("utf-8"))
+        md5.update(str(self.fileobj).encode("utf-8"))
+        md5.update(str(len(self._objects)).encode("utf-8"))
+        if hasattr(self, "_info"):
+            for k, v in cast(DictionaryObject, self._info.get_object()).items():
+                md5.update(f"{k}={v}".encode())
+        return ByteStringObject(md5.hexdigest().encode("utf-8"))
 
     def generate_file_identifiers(self) -> None:
         """
         Generate an identifier for the PDF that will be written.
 
         The only point of this is ensuring uniqueness. Reproducibility is not
-        required; see 14.4 "File Identifiers".
-        """
-        if hasattr(self, "_ID") and self._ID and len(self._ID) == 2:
-            ID_1 = self._ID[0]
+        required;
+        When a file is first written, both identifiers shall be set to the same value.
+        If both identifiers match when a file reference is resolved, it is very
+        likely that the correct and unchanged file has been found. If only the first
+         identifier matches, a different version of the correct file has been found.
+        see 14.4 "File Identifiers".
+        """
+        if self._ID:
+            id1 = self._ID[0]
+            id2 = self._compute_document_identifier()
         else:
-            ID_1 = self._compute_document_identifier_from_content()
-        ID_2 = self._compute_document_identifier_from_content()
-        self._ID = ArrayObject((ID_1, ID_2))
+            id1 = self._compute_document_identifier()
+            id2 = ByteStringObject(id1.original_bytes)
+        self._ID = ArrayObject((id1, id2))
 
     def encrypt(
         self,
@@ -1230,7 +1235,9 @@ def encrypt(
             if not use_128bit:
                 alg = EncryptAlgorithm.RC4_40
         self.generate_file_identifiers()
-        self._encryption = Encryption.make(alg, permissions_flag, self._ID[0])
+        self._encryption = Encryption.make(
+            alg, permissions_flag, cast(ArrayObject, self._ID)[0]
+        )
         # in case call `encrypt` again
         entry = self._encryption.write_entry(user_password, owner_password)
         if self._encrypt_entry:
@@ -1331,7 +1338,7 @@ def _write_trailer(self, stream: StreamType, xref_location: int) -> None:
                 NameObject(TK.INFO): self._info,
             }
         )
-        if hasattr(self, "_ID"):
+        if self._ID:
             trailer[NameObject(TK.ID)] = self._ID
         if self._encrypt_entry:
             trailer[NameObject(TK.ENCRYPT)] = self._encrypt_entry.indirect_reference

From f095cdcaa8a73c4b953f393b669c62975ab59acb Mon Sep 17 00:00:00 2001
From: Martin Thoma <info@martin-thoma.de>
Date: Sat, 23 Dec 2023 20:11:18 +0100
Subject: [PATCH 2/2] Update pypdf/_writer.py

---
 pypdf/_writer.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pypdf/_writer.py b/pypdf/_writer.py
index 9aa6aa8fe..8a69e34a0 100644
--- a/pypdf/_writer.py
+++ b/pypdf/_writer.py
@@ -1329,9 +1329,8 @@ def encrypt(
             if not use_128bit:
                 alg = EncryptAlgorithm.RC4_40
         self.generate_file_identifiers()
-        self._encryption = Encryption.make(
-            alg, permissions_flag, cast(ArrayObject, self._ID)[0]
-        )
+        assert self._ID
+        self._encryption = Encryption.make(alg, permissions_flag, self._ID[0])
         # in case call `encrypt` again
         entry = self._encryption.write_entry(user_password, owner_password)
         if self._encrypt_entry: