From 6bdac26369c0d770759c2b6ce24afef608a91ec9 Mon Sep 17 00:00:00 2001
From: Jay Berkenbilt <ejb@ql.org>
Date: Sun, 27 Sep 2009 20:33:17 +0000
Subject: [PATCH] finished testing C API

git-svn-id: svn+q:///qpdf/trunk@734 71b93d88-0707-0410-a8cf-f5a4172ac649
---
 README.maintainer                        |   2 ++
 configure.ac                             |   2 +-
 libqpdf/qpdf-c.cc                        |   8 ++---
 manual/qpdf-manual.xml                   |   4 +--
 qpdf.spec                                |   2 +-
 qpdf/qpdf-ctest.c                        |  43 +++++++++++++++++++++++
 qpdf/qpdf.cc                             |   2 +-
 qpdf/qtest/qpdf.test                     |  25 +++++++++++++
 qpdf/qtest/qpdf/c-decrypt-with-owner.pdf | Bin 0 -> 9668 bytes
 qpdf/qtest/qpdf/c-decrypt-with-user.pdf  | Bin 0 -> 9668 bytes
 qpdf/qtest/qpdf/c-r2.pdf                 | Bin 0 -> 9893 bytes
 qpdf/qtest/qpdf/c-r3.pdf                 | Bin 0 -> 9897 bytes
 12 files changed, 79 insertions(+), 9 deletions(-)
 create mode 100644 qpdf/qtest/qpdf/c-decrypt-with-owner.pdf
 create mode 100644 qpdf/qtest/qpdf/c-decrypt-with-user.pdf
 create mode 100644 qpdf/qtest/qpdf/c-r2.pdf
 create mode 100644 qpdf/qtest/qpdf/c-r3.pdf

diff --git a/README.maintainer b/README.maintainer
index 2fe189f0..28fb6119 100644
--- a/README.maintainer
+++ b/README.maintainer
@@ -16,6 +16,8 @@ Release Reminders
 
    make_dist verifies this consistency.
 
+ * Update release date in manual/qpdf-manual.xml
+
  * Each year, update copyright notices.  Just search for Copyright.
    Last updated: 2009.
 
diff --git a/configure.ac b/configure.ac
index e66af81f..21fd01c6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script.
 dnl This config.in requires autoconf 2.5 or greater.
 
 AC_PREREQ(2.60)
-AC_INIT(qpdf,2.0.6)
+AC_INIT(qpdf,2.1.a1)
 
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_FILES([autoconf.mk])
diff --git a/libqpdf/qpdf-c.cc b/libqpdf/qpdf-c.cc
index 5f894895..9e2d0cbf 100644
--- a/libqpdf/qpdf-c.cc
+++ b/libqpdf/qpdf-c.cc
@@ -376,10 +376,10 @@ void qpdf_set_r3_encryption_parameters(
 	((print == QPDF_R3_PRINT_LOW) ? QPDFWriter::r3p_low :
 	 (print == QPDF_R3_PRINT_NONE) ? QPDFWriter::r3p_none :
 	 QPDFWriter::r3p_full),
-	((print == QPDF_R3_MODIFY_ANNOTATE) ? QPDFWriter::r3m_annotate :
-	 (print == QPDF_R3_MODIFY_FORM) ? QPDFWriter::r3m_form :
-	 (print == QPDF_R3_MODIFY_ASSEMBLY) ? QPDFWriter::r3m_assembly :
-	 (print == QPDF_R3_MODIFY_NONE) ? QPDFWriter::r3m_none :
+	((modify == QPDF_R3_MODIFY_ANNOTATE) ? QPDFWriter::r3m_annotate :
+	 (modify == QPDF_R3_MODIFY_FORM) ? QPDFWriter::r3m_form :
+	 (modify == QPDF_R3_MODIFY_ASSEMBLY) ? QPDFWriter::r3m_assembly :
+	 (modify == QPDF_R3_MODIFY_NONE) ? QPDFWriter::r3m_none :
 	 QPDFWriter::r3m_all));
 }
 
diff --git a/manual/qpdf-manual.xml b/manual/qpdf-manual.xml
index eb3c54b9..d5f43cac 100644
--- a/manual/qpdf-manual.xml
+++ b/manual/qpdf-manual.xml
@@ -5,8 +5,8 @@
 <!ENTITY mdash "&#x2014;">
 <!ENTITY ndash "&#x2013;">
 <!ENTITY nbsp "&#xA0;">
-<!ENTITY swversion "2.0.6">
-<!ENTITY lastreleased "May 3, 2009">
+<!ENTITY swversion "2.1.a1">
+<!ENTITY lastreleased "XXX, 2009">
 ]>
 <book>
  <bookinfo>
diff --git a/qpdf.spec b/qpdf.spec
index f7fd855a..433d3bd1 100644
--- a/qpdf.spec
+++ b/qpdf.spec
@@ -1,6 +1,6 @@
 Summary: Command-line tools and library for transforming PDF files
 Name: qpdf
-Version: 2.0.6
+Version: 2.1.a1
 Release: 1%{?dist}
 License: Artistic
 Group: System Environment/Libraries
diff --git a/qpdf/qpdf-ctest.c b/qpdf/qpdf-ctest.c
index 456f06c6..42d8f9f4 100644
--- a/qpdf/qpdf-ctest.c
+++ b/qpdf/qpdf-ctest.c
@@ -159,6 +159,46 @@ static void test10(char const* infile,
     report_errors();
 }
 
+static void test11(char const* infile,
+		   char const* password,
+		   char const* outfile)
+{
+    qpdf_read(qpdf, infile, password);
+    qpdf_init_write(qpdf, outfile);
+    qpdf_set_static_ID(qpdf, QPDF_TRUE);
+    qpdf_set_r2_encryption_parameters(
+	qpdf, "user1", "owner1", QPDF_FALSE, QPDF_TRUE, QPDF_TRUE, QPDF_TRUE);
+    qpdf_write(qpdf);
+    report_errors();
+}
+
+static void test12(char const* infile,
+		   char const* password,
+		   char const* outfile)
+{
+    qpdf_read(qpdf, infile, password);
+    qpdf_init_write(qpdf, outfile);
+    qpdf_set_static_ID(qpdf, QPDF_TRUE);
+    qpdf_set_r3_encryption_parameters(
+	qpdf, "user2", "owner2", QPDF_TRUE, QPDF_TRUE,
+	QPDF_R3_PRINT_LOW, QPDF_R3_MODIFY_ALL);
+    qpdf_write(qpdf);
+    report_errors();
+}
+
+static void test13(char const* infile,
+		   char const* password,
+		   char const* outfile)
+{
+    qpdf_read(qpdf, infile, password);
+    printf("user password: %s\n", qpdf_get_user_password(qpdf));
+    qpdf_init_write(qpdf, outfile);
+    qpdf_set_static_ID(qpdf, QPDF_TRUE);
+    qpdf_set_preserve_encryption(qpdf, QPDF_FALSE);
+    qpdf_write(qpdf);
+    report_errors();
+}
+
 int main(int argc, char* argv[])
 {
     char* whoami = 0;
@@ -202,6 +242,9 @@ int main(int argc, char* argv[])
 	  (n == 8) ? test08 :
 	  (n == 9) ? test09 :
 	  (n == 10) ? test10 :
+	  (n == 11) ? test11 :
+	  (n == 12) ? test12 :
+	  (n == 13) ? test13 :
 	  0);
 
     if (fn == 0)
diff --git a/qpdf/qpdf.cc b/qpdf/qpdf.cc
index 9cd0df7b..cc65328f 100644
--- a/qpdf/qpdf.cc
+++ b/qpdf/qpdf.cc
@@ -472,7 +472,7 @@ int main(int argc, char* argv[])
 	//               1         2         3         4         5         6         7         8
 	//      12345678901234567890123456789012345678901234567890123456789012345678901234567890
 	std::cout
-	    << whoami << " version 2.0.6" << std::endl
+	    << whoami << " version 2.1.a1" << std::endl
 	    << "Copyright (c) 2005-2009 Jay Berkenbilt"
 	    << std::endl
 	    << "This software may be distributed under the terms of version 2 of the"
diff --git a/qpdf/qtest/qpdf.test b/qpdf/qtest/qpdf.test
index 70021676..8cf355b0 100644
--- a/qpdf/qtest/qpdf.test
+++ b/qpdf/qtest/qpdf.test
@@ -851,6 +851,31 @@ $td->runtest("invalid password",
 	      $td->EXIT_STATUS => 2},
 	     $td->NORMALIZE_NEWLINES);
 
+my @cenc = (
+    [11, 'hybrid-xref.pdf', "''", 'r2', ""],
+    [12, 'hybrid-xref.pdf', "''", 'r3', ""],
+    [13, 'c-r2.pdf', 'user1', 'decrypt with user',
+     "user password: user1\n"],
+    [13, 'c-r3.pdf', 'owner2', 'decrypt with owner',
+     "user password: user2\n"],
+    );
+$n_tests += 2 * @cenc;
+
+foreach my $d (@cenc)
+{
+    my ($n, $infile, $pass, $description, $output) = @$d;
+    my $outfile = $description;
+    $outfile =~ s/ /-/g;
+    my $outfile = "c-$outfile.pdf";
+    $td->runtest("C API encryption: $description",
+		 {$td->COMMAND => "qpdf-ctest $n $infile $pass a.pdf"},
+		 {$td->STRING => $output, $td->EXIT_STATUS => 0},
+		 $td->NORMALIZE_NEWLINES);
+    $td->runtest("check $description",
+		 {$td->FILE => "a.pdf"},
+		 {$td->FILE => $outfile});
+}
+
 # Test combinations of linearization and encryption.  Note that we do
 # content checks on encrypted and linearized files in various
 # combinations below.  Here we are just making sure that they are
diff --git a/qpdf/qtest/qpdf/c-decrypt-with-owner.pdf b/qpdf/qtest/qpdf/c-decrypt-with-owner.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..9a0f23b4ff35384cebe384cfbca24ce01da2efd4
GIT binary patch
literal 9668
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
TuGYmaA$Y!8A~|`MK~MYycWTlT

literal 0
HcmV?d00001

diff --git a/qpdf/qtest/qpdf/c-decrypt-with-user.pdf b/qpdf/qtest/qpdf/c-decrypt-with-user.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..9a0f23b4ff35384cebe384cfbca24ce01da2efd4
GIT binary patch
literal 9668
zcmc&)dr(tX8fWc-^tP5q#X;2eK!a6FP3|KJ5d{RyfDZx*Em}kg$(4o;i6$4sXi-YF
zK3Z06-M*~bb-UITtr%#nOFOKt-BQ-AS}o4*IH*+GOx4!Gw!Yimdrsiq_GH>*2Il_3
zTyk^H`Tfp!zVDaseDft2<mewIr>cqMj%z!9AV{DB&hkoP`gEW)RC9KlgLMO%e`y5D
z0&@jB*Idrp-GEe!ujV<eEKok?W(UW^k^CSH8dS7mDL)|F%$e=Z3Xq;ounwz$K}oRC
z7(;obiK_z2xvZmtdlG0!6;SGJc8+!NPrI38b65*R%LgPaeC2X;AXO`@>E>Llxr(UW
z_WIUR=SkJ*b>G~G`_k1OuluOx(tEq7B<{Rh!R#gz)7v&>mKL6P$Mk8^^%J*8=5JG`
zUG^4EemC~k^%;h<miE}_(QhUgqpg_@FB11oYS>)g6gkE_H!LyZ@4ru~OIbc$v9|BN
z+`ny1d*jsO6QcKd$k(&_J?&>N%_k2&5!ct)3eIHqPyO;*TV2PUtLMOqj<b7<#}yy8
zkJ)3|yl~omce<Xg{`Re7i_2OU?`!z_?YPtRwfEOuu3Nt0ixubRn>4oK_IDau5A>al
zjhwn<bAIJ_^|x=VX$iL<^lqQ?2bF!tp7p)ftB3DYu3q`V^>>#>-7rKyR$1vjK>RUz
zZ|T9!PkBl<E!tc2LDYhC4Wm}6nxe>0ns2RY?W|wqQLdl3$h|F_iyx8poVIL_Z$WN^
z>dnTOS~r(Vm;R$Kc13eyW$zd7P0q2zgeOfM)wOWPZT*=sXGUu;est&k3+ks&=N7Ks
z6yDKZm+yW1=xe%9{>ogu>iL(hsQbwNKecWBxBdMw^>?3o<w{c&5izms$r0hn`<oIy
zE$Rb(U!`>{D}2?vK2MpkXxy}aCZy?BZMiFR*}YxGlUI%};MP35VS8$J)^jnQKR<CY
zVP{NZ_wGxISe-uh;cM&Kw$8{mt}Hhs6&?foAL`px75!G6;&M&@^Bphjer-m!D&p40
zBNhJ}ztC~C-%^tDhQ;>vi+|}grQ95=f4N1`AHVUytW$A^e(b;CS-qGVne`p{Y^!_w
zx#oR0Z-(U^daC;WwMTPeG>ykUi~puq^~|)ba~^!?c3DDH_dQkHCVU>>|Hy}#jm*w&
zL+8uMvofZE3mHov_@KG&`;2cN9XE$}UcayT-59$0K+I%2s~sGmdB2@wv${bEpimG{
zC}1cp3<)X~J#_FvqL=(6A<SqY1o?*$9sC2u9?hVUXaa?XQ2q&MX%ekTBRtv<gjS*a
ztN4fbS3zqsXcY#n$)E`gn!xynAOr?2T?&*aS_M6DOX3;sLo|egV;!6uFo=nA9&5Fk
zvz)cOO$0;@Ndc{n0{m(PW*0wlP%ezD+ga_h@JkCKq<8XP!GB1=ApYs;{2Z6lVq!VK
zpuGsML{d^t!W4{?8tqvwP6B6~6FLByI6+^+IU#S5i<4jxoRk08NFINp1dHIDP@KqR
zC&3~(C;v~hOm-41f^+g`1Tt|FEP`{ARiEI`1I`Hvom~DTSOn*UlvXZI0d-s>tBz9v
zbzCE>j>9AZJ3Ec6Iu0`$oRh3N4$~`~ldL)pb3L4stU3-8Pn?siI!*`FagD4x4%2Sj
zPO|DayaV8zWYuvxppI*0)p0tYj%#Jrad<1k&Q2?<j>9V=&Pi4shxb*SldL)pFV8q9
zS#=!V<Z({2>Npcn$F;KRIIMBtc9K=cVFhJ?Q^0blzh26hHKdhLH*wxraC|vkq@oHV
z^X~Hg_xUxQnTd+<&hE%gWnRk1#j4MWB0uhRjXFOftVd5wz$#m?-ZB83Wp=Z$7^BQ(
z?KLcCvzUQ$mV>Xy+8h-?S!{F6bhvHei+pnxU-i|KKxwKj=U@p~sL=4AQK1H|B^HBW
zAxFR};fp&tdVUmJ%Yo8?S~0BH3{d%18;~K|fDw)0vl9835!BKu#Lyz28Z^HzlbDSo
zOKS~7i`*?D8wuWfeo@j?ODhUPi~OmGoJZirRJF8jFr>(B$3^7TL?OOssTvI}vgDlC
z6Gj|aP~l<mZAxNoQ=oH}-t>QU&!H-dxaFQCVl2L8X&N}Bz~U+Qj3wf6U}>&5q`;!7
zdmbSYFko1!2<nhSHMJPaJq$4p2M$`lLIplC7*IVki19dZ(DD^3@JSKaKs<m02d!SA
z0-qLv=MxX&z(I>wh`=opuQn3^2M$`hLIsw@aV3$60}q>YG2)heS|Sfe4qCcGP6$N5
z_LUIxaO9x1D`aHRv3*s90Y?s6yh276J=<496ky2kf*zE5g^El`&Ut2lBnV!^hX+~o
zZQtwwsR+Dm4-c{^*}jDVJWM-G0yeVCHsu-XvV-fE{w~bN2FP`_K?_*O$1KUR9RXZh
z8?=Ijj4TPN<$+v#*d&aS1l5`V87I8y4vT|%B|)_zK*p&ZHVN}ef@%w4!i7XCVdx?_
z-^eZ*Z23urZ9M@xeo*HR-zrdr`U0|@_UbAJ-(Dc}0`RQ`7S8Dcd{2SU2~f=U7?6PC
z|M>0#qtnUv7VsH1-@#<Ed03FjH)rJKfRgDn$&hLtrBT!BRGn5wQ*<h$p)?Flr_z*G
zr%wOv5v4!7Y+B00MoiR4)J05;ST{bpdBTzMGQ~^Rk6pU5c0+yB{noD0;85hl@mIW)
z3bS7AnZ2ucZ2X0pXQo6q6C>|A9DZ?^V$0h9Owuz~TNV_37#8+;ib5^iet+I<;^xdQ
TuGYmaA$Y!8A~|`MK~MYycWTlT

literal 0
HcmV?d00001

diff --git a/qpdf/qtest/qpdf/c-r2.pdf b/qpdf/qtest/qpdf/c-r2.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..0301696cfa65e5d80d25704419ce69d1c121431e
GIT binary patch
literal 9893
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
IY8xu*e^&I-)c^nh

literal 0
HcmV?d00001

diff --git a/qpdf/qtest/qpdf/c-r3.pdf b/qpdf/qtest/qpdf/c-r3.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..55493b2ed71971e14629fb8f85c456dcfdebea59
GIT binary patch
literal 9897
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
KPj8uvJ?6h2ytwB8

literal 0
HcmV?d00001