summaryrefslogtreecommitdiff
path: root/Build/source/texk/dvipdfm-x/pdfencrypt.c
diff options
context:
space:
mode:
authorAkira Kakuto <kakuto@fuk.kindai.ac.jp>2018-08-16 22:45:32 +0000
committerAkira Kakuto <kakuto@fuk.kindai.ac.jp>2018-08-16 22:45:32 +0000
commit782ad0de9c74750a257e739156305682532a2e94 (patch)
treed9730b8fcf557880ca7b83b4c0002d3f6dd19ea9 /Build/source/texk/dvipdfm-x/pdfencrypt.c
parent8a76770f246ae3adb341b873bf6cdb25d0114ef2 (diff)
Fix a bug that CMapName in CMap resource is not properly written (S. Hirata).
git-svn-id: svn://tug.org/texlive/trunk@48418 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/dvipdfm-x/pdfencrypt.c')
-rw-r--r--Build/source/texk/dvipdfm-x/pdfencrypt.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/Build/source/texk/dvipdfm-x/pdfencrypt.c b/Build/source/texk/dvipdfm-x/pdfencrypt.c
index d5cb1cf046e..3fc80eae1a2 100644
--- a/Build/source/texk/dvipdfm-x/pdfencrypt.c
+++ b/Build/source/texk/dvipdfm-x/pdfencrypt.c
@@ -72,6 +72,7 @@ static struct pdf_sec {
struct {
int use_aes;
int encrypt_metadata;
+ int need_adobe_extension;
} setting;
struct {
@@ -106,6 +107,7 @@ pdf_enc_init (int use_aes, int encrypt_metadata)
srand(current_time); /* For AES IV */
p->setting.use_aes = use_aes;
p->setting.encrypt_metadata = encrypt_metadata;
+ p->setting.need_adobe_extension = 0;
}
#define PRODUCER \
@@ -475,6 +477,9 @@ check_version (struct pdf_sec *p, int version)
" (plus Adobe Extension Level 3).");
p->V = 4;
}
+ if (p->V == 5 && version < 20) {
+ p->setting.need_adobe_extension = 1;
+ }
}
/* Dummy routine for stringprep - NOT IMPLEMENTED YET
@@ -786,7 +791,7 @@ pdf_encrypt_obj (void)
}
#ifdef USE_ADOBE_EXTENSION
- if (p->R > 5) {
+ if (p->R > 5 && p->setting.need_adobe_extension != 0) {
pdf_obj *catalog = pdf_doc_catalog();
pdf_obj *ext = pdf_new_dict();
pdf_obj *adbe = pdf_new_dict();