From 3101955ac0f7f3818dca53d285f5ccd60ccdddea Mon Sep 17 00:00:00 2001
From: Jay Berkenbilt <ejb@ql.org>
Date: Wed, 26 Dec 2012 17:10:25 -0500
Subject: Add V5 parameters to EncryptionData

---
 include/qpdf/QPDF.hh       | 16 ++++++++++++++++
 include/qpdf/QPDFWriter.hh |  1 +
 2 files changed, 17 insertions(+)

(limited to 'include')

diff --git a/include/qpdf/QPDF.hh b/include/qpdf/QPDF.hh
index 70ba3e95..00591ea5 100644
--- a/include/qpdf/QPDF.hh
+++ b/include/qpdf/QPDF.hh
@@ -230,6 +230,8 @@ class QPDF
 	// This class holds data read from the encryption dictionary.
 	EncryptionData(int V, int R, int Length_bytes, int P,
 		       std::string const& O, std::string const& U,
+                       std::string const& OE, std::string const& UE,
+                       std::string const& Perms,
 		       std::string const& id1, bool encrypt_metadata) :
 	    V(V),
 	    R(R),
@@ -237,6 +239,9 @@ class QPDF
 	    P(P),
 	    O(O),
 	    U(U),
+            OE(OE),
+            UE(UE),
+            Perms(Perms),
 	    id1(id1),
 	    encrypt_metadata(encrypt_metadata)
 	{
@@ -248,11 +253,19 @@ class QPDF
 	int getP() const;
 	std::string const& getO() const;
 	std::string const& getU() const;
+	std::string const& getOE() const;
+	std::string const& getUE() const;
+	std::string const& getPerms() const;
 	std::string const& getId1() const;
 	bool getEncryptMetadata() const;
 
         void setO(std::string const&);
         void setU(std::string const&);
+        void setV5EncryptionParameters(std::string const& O,
+                                       std::string const& OE,
+                                       std::string const& U,
+                                       std::string const& UE,
+                                       std::string const& Perms);
 
       private:
         EncryptionData(EncryptionData const&);
@@ -264,6 +277,9 @@ class QPDF
 	int P;
 	std::string O;
 	std::string U;
+        std::string OE;
+        std::string UE;
+        std::string Perms;
 	std::string id1;
 	bool encrypt_metadata;
     };
diff --git a/include/qpdf/QPDFWriter.hh b/include/qpdf/QPDFWriter.hh
index 611c6aef..89536e13 100644
--- a/include/qpdf/QPDFWriter.hh
+++ b/include/qpdf/QPDFWriter.hh
@@ -295,6 +295,7 @@ class QPDFWriter
     void setEncryptionParametersInternal(
 	int V, int R, int key_len, long P,
 	std::string const& O, std::string const& U,
+	std::string const& OE, std::string const& UE, std::string const& Perms,
 	std::string const& id1, std::string const& user_password);
     void setDataKey(int objid);
     int openObject(int objid = 0);
-- 
cgit v1.2.3-54-g00ecf