Fixed encryption of Unicode strings

Author: packdat

PdfSharpCore/Pdf.IO/PdfWriter.cs

@@ -198,8 +198,8 @@ public void Write(PdfString value)
             WriteSeparator(CharCat.Delimiter);
             PdfStringEncoding encoding = (PdfStringEncoding)(value.Flags & PdfStringFlags.EncodingMask);
             string pdf = (value.Flags & PdfStringFlags.HexLiteral) == 0 ?
-                PdfEncoders.ToStringLiteral(value.Value, encoding, SecurityHandler) :
-                PdfEncoders.ToHexStringLiteral(value.Value, encoding, SecurityHandler);
+                PdfEncoders.ToStringLiteral(value.EncryptionValue, encoding == PdfStringEncoding.Unicode, SecurityHandler) :
+                PdfEncoders.ToHexStringLiteral(value.EncryptionValue, encoding == PdfStringEncoding.Unicode, SecurityHandler);
             WriteRaw(pdf);
 
             _lastCat = CharCat.Delimiter;

PdfSharpCore/Pdf.Internal/RawUnicodeEncoding.cs

@@ -64,9 +64,9 @@ public override int GetCharCount(byte[] bytes, int index, int count)
 
         public override int GetChars(byte[] bytes, int byteIndex, int byteCount, char[] chars, int charIndex)
         {
-            for (int count = byteCount; count > 0; byteIndex += 2, charIndex++, count--)
+            for (int count = byteCount; count > 0; byteIndex += 2, charIndex++, count -= 2)
             {
-                chars[charIndex] = (char)((int)bytes[byteIndex] << 8 + (int)bytes[byteIndex + 1]);
+                chars[charIndex] = (char)((int)(bytes[byteIndex] << 8) + (int)bytes[byteIndex + 1]);
             }
             return byteCount;
         }

PdfSharpCore/Pdf/PdfString.cs

@@ -217,10 +217,33 @@ public string Value
         /// </summary>
         internal byte[] EncryptionValue
         {
-            // TODO: Unicode case is not handled!
-            get { return _value == null ? new byte[0] : PdfEncoders.RawEncoding.GetBytes(_value); }
+            get { return _value == null ? new byte[0] : GetBytesFromEncoding(); }
             // BUG: May lead to trouble with the value semantics of PdfString
-            set { _value = PdfEncoders.RawEncoding.GetString(value, 0, value.Length); }
+            set
+            {
+                var encoding = (PdfStringEncoding)(_flags & PdfStringFlags.EncodingMask);
+                switch (encoding)
+                {
+                    case PdfStringEncoding.Unicode:
+                        _value = PdfEncoders.RawUnicodeEncoding.GetString(value);
+                        break;
+                    default:
+                        _value = PdfEncoders.RawEncoding.GetString(value);
+                        break;
+                }
+            }
+        }
+
+        private byte[] GetBytesFromEncoding()
+        {
+            var encoding = (PdfStringEncoding)(_flags & PdfStringFlags.EncodingMask);
+            switch (encoding)
+            {
+                case PdfStringEncoding.Unicode:
+                    return PdfEncoders.RawUnicodeEncoding.GetBytes(_value);
+                default:
+                    return PdfEncoders.RawEncoding.GetBytes(_value);
+            }
         }
 
         /// <summary>