MAINT: Remove private _security submodule (#1935)

This PR was made to avoid breaking changes the original PR introduced. We want to remove the outdated parameters, but not at the moment. See https://pypdf.readthedocs.io/en/latest/dev/deprecations.html Full credit for the work goes to exiledkingcc via PR #1816 Co-authored-by: exiledkingcc <exiledkingcc@gmail.com>
py-pdf · Jul 2, 2023 · c3279f7 · c3279f7
1 parent 71be38b
commit c3279f7
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 380 deletions.
diff --git a/pypdf/_security.py b/pypdf/_security.py
diff --git a/pypdf/generic/_base.py b/pypdf/generic/_base.py
@@ -492,13 +492,8 @@ def original_bytes(self) -> bytes:
     def write_to_stream(
         self, stream: StreamType, encryption_key: Union[None, str, bytes] = None
     ) -> None:
-        bytearr = self
-        if encryption_key:
-            from .._security import RC4_encrypt
-
-            bytearr = RC4_encrypt(encryption_key, bytearr)  # type: ignore
         stream.write(b"<")
-        stream.write(binascii.hexlify(bytearr))
+        stream.write(binascii.hexlify(self))
         stream.write(b">")
 
     def writeToStream(
@@ -571,24 +566,17 @@ def write_to_stream(
         self, stream: StreamType, encryption_key: Union[None, str, bytes] = None
     ) -> None:
         bytearr = self.get_encoded_bytes()
-        if encryption_key:
-            from .._security import RC4_encrypt
-
-            bytearr = RC4_encrypt(encryption_key, bytearr)
-            obj = ByteStringObject(bytearr)
-            obj.write_to_stream(stream)
-        else:
-            stream.write(b"(")
-            for c in bytearr:
-                if not chr(c).isalnum() and c != b" ":
-                    # This:
-                    #   stream.write(b_(rf"\{c:0>3o}"))
-                    # gives
-                    #   https://github.com/davidhalter/parso/issues/207
-                    stream.write(b_("\\%03o" % c))
-                else:
-                    stream.write(b_(chr(c)))
-            stream.write(b")")
+        stream.write(b"(")
+        for c in bytearr:
+            if not chr(c).isalnum() and c != b" ":
+                # This:
+                #   stream.write(b_(rf"\{c:0>3o}"))
+                # gives
+                #   https://github.com/davidhalter/parso/issues/207
+                stream.write(b_("\\%03o" % c))
+            else:
+                stream.write(b_(chr(c)))
+        stream.write(b")")
 
     def writeToStream(
         self, stream: StreamType, encryption_key: Union[None, str, bytes]

diff --git a/pypdf/generic/_data_structures.py b/pypdf/generic/_data_structures.py
@@ -802,12 +802,7 @@ def write_to_stream(
         DictionaryObject.write_to_stream(self, stream, encryption_key)
         del self[SA.LENGTH]
         stream.write(b"\nstream\n")
-        data = self._data
-        if encryption_key:
-            from .._security import RC4_encrypt
-
-            data = RC4_encrypt(encryption_key, data)
-        stream.write(data)
+        stream.write(self._data)
         stream.write(b"\nendstream")
 
     @staticmethod

diff --git a/tests/test_generic.py b/tests/test_generic.py
@@ -304,7 +304,7 @@ def test_bytestringobject():
     stream = BytesIO(b"")
     bo.write_to_stream(stream, encryption_key="foobar")
     stream.seek(0, 0)
-    assert stream.read() == b"<1cdd628b972e>"  # TODO: how can we verify this?
+    assert stream.read() == b"<73747265616d>"  # TODO: how can we verify this?
 
 
 def test_dictionaryobject_key_is_no_pdfobject():