dompdf#1502 | Added o_cidSystemInfo to encrypt fields in this prev co…

…ntent block
ohgoodlord · Sep 14, 2017 · 05d60b2 · 05d60b2
1 parent 83d5484
commit 05d60b2
Showing 1 changed file with 37 additions and 16 deletions.
diff --git a/lib/Cpdf.php b/lib/Cpdf.php
@@ -1142,24 +1142,9 @@ protected function o_fontDescendentCID($id, $action, $options = '')
 
                 // we need a CID system info section
                 $cidSystemInfoId = ++$this->numObj;
-                $this->o_contents($cidSystemInfoId, 'new', 'raw');
+                $this->o_cidSystemInfo($cidSystemInfoId, 'new');
                 $this->objects[$id]['info']['cidSystemInfo'] = $cidSystemInfoId;
 
-                $ordering = '(UCS)';
-                $registry = '(Adobe)';
-
-                if ($this->encrypted) {
-                    $this->encryptInit($id);
-                    $ordering = $this->ARC4($ordering);
-                    $registry = $this->ARC4($registry);
-                }
-
-                $res = '<</Registry ' . $registry . "\n"; // A string identifying an issuer of character collections
-                $res .= '/Ordering ' . $ordering . "\n"; // A string that uniquely names a character collection issued by a specific registry
-                $res .= "/Supplement 0\n"; // The supplement number of the character collection.
-                $res .= ">>";
-                $this->objects[$cidSystemInfoId]['c'] = $res;
-
                 // and a CID to GID map
                 $cidToGidMapId = ++$this->numObj;
                 $this->o_fontGIDtoCIDMap($cidToGidMapId, 'new', $options);
@@ -1228,6 +1213,42 @@ protected function o_fontDescendentCID($id, $action, $options = '')
         return null;
     }
 
+    protected function o_cidSystemInfo($id, $action, $options = '')
+    {
+        switch ($action) {
+            case 'new':
+                $this->objects[$id] = array(
+                    't' => 'cidSystemInfo'
+                );
+                break;
+            case 'add':
+                break;
+            case 'out':
+                $ordering = '(UCS)';
+                $registry = '(Adobe)';
+
+                if ($this->encrypted) {
+                    $this->encryptInit($id);
+                    $ordering = $this->ARC4($ordering);
+                    $registry = $this->ARC4($registry);
+                }
+
+
+                $res = "\n$id 0 obj\n";
+
+                $res .= '<</Registry ' . $registry . "\n"; // A string identifying an issuer of character collections
+                $res .= '/Ordering ' . $ordering . "\n"; // A string that uniquely names a character collection issued by a specific registry
+                $res .= "/Supplement 0\n"; // The supplement number of the character collection.
+                $res .= ">>";
+
+                $res .= "\nendobj";;
+
+                return $res;
+        }
+
+        return null;
+    }
+
     /**
      * a font glyph to character map, needed for unicode fonts
      *