core/src/fpdfapi/fpdf_parser/fpdf_parser_encrypt.cpp - Issue 1438573002: Merge to XFA: Fix relative includes within core/

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: core/src/fpdfapi/fpdf_parser/fpdf_parser_encrypt.cpp

Issue 1438573002: Merge to XFA: Fix relative includes within core/ (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@xfa

Patch Set: Created 5 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: core/src/fpdfapi/fpdf_parser/fpdf_parser_encrypt.cpp

diff --git a/core/src/fpdfapi/fpdf_parser/fpdf_parser_encrypt.cpp b/core/src/fpdfapi/fpdf_parser/fpdf_parser_encrypt.cpp

index 125b7e0bf5fc92bb5046c6b2243b08fefef539e6..363864e5889a220a15d4f1e856496e0e43725d9a 100644

--- a/core/src/fpdfapi/fpdf_parser/fpdf_parser_encrypt.cpp

+++ b/core/src/fpdfapi/fpdf_parser/fpdf_parser_encrypt.cpp

@@ -4,9 +4,12 @@

+#include "core/include/fpdfapi/fpdf_parser.h"

#include <time.h>

-#include "../../../include/fpdfapi/fpdf_parser.h"

-#include "../../../include/fdrm/fx_crypt.h"

+#include "core/include/fdrm/fx_crypt.h"

const uint8_t defpasscode[32] = {

0x28, 0xbf, 0x4e, 0x5e, 0x4e, 0x75, 0x8a, 0x41, 0x64, 0x00, 0x4e,

0x56, 0xff, 0xfa, 0x01, 0x08, 0x2e, 0x2e, 0x00, 0xb6, 0xd0, 0x68,