Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
onlyoffice_core
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boris Kocherov
onlyoffice_core
Commits
6bc818e5
Commit
6bc818e5
authored
Jul 26, 2016
by
ElenaSubbotina
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix errors linux build
parent
1fb27ca9
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
157 additions
and
150 deletions
+157
-150
ASCOfficeDocxFile2/Linux/ASCOfficeDocxFile2Lib.pro
ASCOfficeDocxFile2/Linux/ASCOfficeDocxFile2Lib.pro
+150
-146
OfficeCryptReader/source/CryptTransform.cpp
OfficeCryptReader/source/CryptTransform.cpp
+5
-3
OfficeCryptReader/source/ECMACryptReader.cpp
OfficeCryptReader/source/ECMACryptReader.cpp
+1
-1
X2tConverter/build/Qt/X2tConverter.pro
X2tConverter/build/Qt/X2tConverter.pro
+1
-0
No files found.
ASCOfficeDocxFile2/Linux/ASCOfficeDocxFile2Lib.pro
View file @
6bc818e5
...
@@ -103,7 +103,9 @@ SOURCES += ../DocWrapper/DocxSerializer.cpp \
...
@@ -103,7 +103,9 @@ SOURCES += ../DocWrapper/DocxSerializer.cpp \
..
/../
XlsxSerializerCom
/
Reader
/
CommonWriter
.
cpp
\
..
/../
XlsxSerializerCom
/
Reader
/
CommonWriter
.
cpp
\
..
/../
XlsxSerializerCom
/
Reader
/
CSVReader
.
cpp
\
..
/../
XlsxSerializerCom
/
Reader
/
CSVReader
.
cpp
\
..
/../
XlsxSerializerCom
/
Writer
/
CSVWriter
.
cpp
\
..
/../
XlsxSerializerCom
/
Writer
/
CSVWriter
.
cpp
\
..
/
DocWrapper
/
ChartWriter
.
cpp
..
/
DocWrapper
/
ChartWriter
.
cpp
\
..
/../
OfficeCryptReader
/
source
/
ECMACryptReader
.
cpp
\
..
/../
OfficeCryptReader
/
source
/
CryptTransform
.
cpp
HEADERS
+=
..
/
DocWrapper
/
DocxSerializer
.
h
\
HEADERS
+=
..
/
DocWrapper
/
DocxSerializer
.
h
\
..
/
DocWrapper
/
FontProcessor
.
h
\
..
/
DocWrapper
/
FontProcessor
.
h
\
...
@@ -137,7 +139,9 @@ HEADERS += ../DocWrapper/DocxSerializer.h \
...
@@ -137,7 +139,9 @@ HEADERS += ../DocWrapper/DocxSerializer.h \
..
/
BinReader
/
webSettingsWriter
.
h
\
..
/
BinReader
/
webSettingsWriter
.
h
\
..
/../
Common
/
FileDownloader
/
FileDownloader
.
h
\
..
/../
Common
/
FileDownloader
/
FileDownloader
.
h
\
..
/
BinReader
/
DefaultThemeWriter
.
h
\
..
/
BinReader
/
DefaultThemeWriter
.
h
\
..
/
DocWrapper
/
ChartWriter
.
h
..
/
DocWrapper
/
ChartWriter
.
h
\
..
/../
OfficeCryptReader
/
source
/
ECMACryptReader
.
h
\
..
/../
OfficeCryptReader
/
source
/
CryptTransform
.
h
unix
{
unix
{
target
.
path
=
/
usr
/
lib
target
.
path
=
/
usr
/
lib
...
...
OfficeCryptReader/source/CryptTransform.cpp
View file @
6bc818e5
...
@@ -197,7 +197,8 @@ _buf GenerateKey(_buf & salt, _buf & password, _buf & blockKey, int hashSize, in
...
@@ -197,7 +197,8 @@ _buf GenerateKey(_buf & salt, _buf & password, _buf & blockKey, int hashSize, in
for
(
int
i
=
0
;
i
<
spin
;
i
++
)
for
(
int
i
=
0
;
i
<
spin
;
i
++
)
{
{
pHashBuf
=
HashAppend
(
_buf
((
unsigned
char
*
)
&
i
,
4
,
false
),
pHashBuf
,
algorithm
);
_buf
iterator
((
unsigned
char
*
)
&
i
,
4
,
false
);
pHashBuf
=
HashAppend
(
iterator
,
pHashBuf
,
algorithm
);
}
}
pHashBuf
=
HashAppend
(
pHashBuf
,
blockKey
,
algorithm
);
pHashBuf
=
HashAppend
(
pHashBuf
,
blockKey
,
algorithm
);
...
@@ -243,7 +244,8 @@ bool ECMADecryptor::SetPassword(std::wstring password_)
...
@@ -243,7 +244,8 @@ bool ECMADecryptor::SetPassword(std::wstring password_)
DecryptAES
(
verifierInputKey
,
pSalt
,
pEncVerInput
,
decryptedVerifierHashInputBytes
);
DecryptAES
(
verifierInputKey
,
pSalt
,
pEncVerInput
,
decryptedVerifierHashInputBytes
);
//--------------------------------------------
//--------------------------------------------
_buf
hashBuf
=
HashAppend
(
decryptedVerifierHashInputBytes
,
_buf
(),
cryptData
.
hashAlgorithm
);
_buf
empty
(
NULL
,
0
,
false
);
_buf
hashBuf
=
HashAppend
(
decryptedVerifierHashInputBytes
,
empty
,
cryptData
.
hashAlgorithm
);
//--------------------------------------------
//--------------------------------------------
_buf
decryptedVerifierHashBytes
;
_buf
decryptedVerifierHashBytes
;
...
...
OfficeCryptReader/source/ECMACryptReader.cpp
View file @
6bc818e5
...
@@ -241,7 +241,7 @@ bool ECMACryptReader::DecryptOfficeFile(std::wstring file_name_inp, std::wstring
...
@@ -241,7 +241,7 @@ bool ECMACryptReader::DecryptOfficeFile(std::wstring file_name_inp, std::wstring
if
(
data_out
)
if
(
data_out
)
{
{
NSFile
::
CFileBinary
f
;
NSFile
::
CFileBinary
f
;
f
.
CreateFile
(
file_name_out
);
f
.
CreateFileW
(
file_name_out
);
f
.
WriteFile
(
data_out
,
lengthData
);
f
.
WriteFile
(
data_out
,
lengthData
);
f
.
CloseFile
();
f
.
CloseFile
();
...
...
X2tConverter/build/Qt/X2tConverter.pro
View file @
6bc818e5
...
@@ -253,6 +253,7 @@ linux-g++ | linux-g++-64 | linux-g++-32 {
...
@@ -253,6 +253,7 @@ linux-g++ | linux-g++-64 | linux-g++-32 {
LIBS
+=
-
lz
LIBS
+=
-
lz
LIBS
+=
-
lxml2
LIBS
+=
-
lxml2
LIBS
+=
-
lcurl
LIBS
+=
-
lcurl
LIBS
+=
-
lcrypto
++
}
}
mac
{
mac
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment