Add debug printing function for encryption information.

2 files changed, 26 insertions, 13 deletions

diff --git a/mupdf/mupdf.h b/mupdf/mupdf.h
index 52fe415b..70b130c7 100644
--- a/mupdf/mupdf.h
+++ b/mupdf/mupdf.h
@@ -112,6 +112,8 @@ void pdf_cryptobj(pdf_crypt *crypt, fz_obj *obj, int num, int gen);
 int pdf_needspassword(pdf_xref *xref);
 int pdf_authenticatepassword(pdf_xref *xref, char *pw);
 
+void pdf_debugcrypt(pdf_crypt *crypt);
+
 /*
  * xref and object / stream api
  */
diff --git a/mupdf/pdf_crypt.c b/mupdf/pdf_crypt.c
index 1b0f0787..019f889c 100644
--- a/mupdf/pdf_crypt.c
+++ b/mupdf/pdf_crypt.c
@@ -182,19 +182,6 @@ pdf_newcrypt(pdf_crypt **cryptp, fz_obj *dict, fz_obj *id)
 	else
 		fz_warn("missing file identifier, may not be able to do decryption");
 
-#if 0
-	{
-		int i;
-		printf("crypt: v=%d length=%d\n", crypt->v, crypt->length);
-		printf("crypt: stmf method=%d length=%d\n", crypt->stmf.method, crypt->stmf.length);
-		printf("crypt: strf method=%d length=%d\n", crypt->strf.method, crypt->strf.length);
-		printf("crypt: r=%d\n", crypt->r);
-		printf("crypt: o=<"); for (i = 0; i < 32; i++) printf("%02X", crypt->o[i]); printf(">\n");
-		printf("crypt: u=<"); for (i = 0; i < 32; i++) printf("%02X", crypt->u[i]); printf(">\n");
-		printf("crypt: p=0x%08X\n", crypt->p);
-	}
-#endif
-
 	*cryptp = crypt;
 	return fz_okay;
 }
@@ -604,3 +591,27 @@ pdf_opencrypt(fz_stream *chain, pdf_crypt *crypt, pdf_cryptfilter *stmf, int num
 
 	return fz_opencopy(chain);
 }
+
+void pdf_debugcrypt(pdf_crypt *crypt)
+{
+	int i;
+
+	printf("crypt {\n");
+
+	printf("\tv=%d length=%d\n", crypt->v, crypt->length);
+	printf("\tstmf method=%d length=%d\n", crypt->stmf.method, crypt->stmf.length);
+	printf("\tstrf method=%d length=%d\n", crypt->strf.method, crypt->strf.length);
+	printf("\tr=%d\n", crypt->r);
+
+	printf("\to=<");
+	for (i = 0; i < 32; i++)
+		printf("%02X", crypt->o[i]);
+	printf(">\n");
+
+	printf("\tu=<");
+	for (i = 0; i < 32; i++)
+		printf("%02X", crypt->u[i]);
+	printf(">\n");
+
+	printf("}\n");
+}