checkpoint -- first crack at C API, minor refactoring of encryption functions

git-svn-id: svn+q:///qpdf/trunk@720 71b93d88-0707-0410-a8cf-f5a4172ac649

1 files changed, 4 insertions, 5 deletions

diff --git a/qpdf/qpdf.cc b/qpdf/qpdf.cc
index bcf2e33e..40a83a87 100644
--- a/qpdf/qpdf.cc
+++ b/qpdf/qpdf.cc
@@ -168,18 +168,17 @@ void usage(std::string const& msg)
 static void show_encryption(QPDF& pdf)
 {
     // Extract /P from /Encrypt
-    QPDFObjectHandle trailer = pdf.getTrailer();
-    QPDFObjectHandle encrypt = trailer.getKey("/Encrypt");
-    if (encrypt.isNull())
+    if (! pdf.isEncrypted())
     {
 	std::cout << "File is not encrypted" << std::endl;
     }
     else
     {
+	QPDFObjectHandle trailer = pdf.getTrailer();
+	QPDFObjectHandle encrypt = trailer.getKey("/Encrypt");
 	QPDFObjectHandle P = encrypt.getKey("/P");
 	std::cout << "P = " << P.getIntValue() << std::endl;
-	std::string user_password = pdf.getUserPassword();
-	QPDF::trim_user_password(user_password);
+	std::string user_password = pdf.getTrimmedUserPassword();
 	std::cout << "User password = " << user_password << std::endl;
     }
 }