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
227d4f18
Commit
227d4f18
authored
Jun 08, 2017
by
Oleg Korshul
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
.
parent
36bdbad6
Changes
8
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
509 additions
and
16 deletions
+509
-16
.gitignore
.gitignore
+1
-0
Common/3dParty/openssl/build.sh
Common/3dParty/openssl/build.sh
+12
-0
Common/3dParty/openssl/fetch.sh
Common/3dParty/openssl/fetch.sh
+8
-0
DesktopEditor/xmlsec/src/include/XmlCertificate.h
DesktopEditor/xmlsec/src/include/XmlCertificate.h
+23
-0
DesktopEditor/xmlsec/src/ooxmlsignature.pro
DesktopEditor/xmlsec/src/ooxmlsignature.pro
+10
-0
DesktopEditor/xmlsec/src/src/XmlSigner_openssl.h
DesktopEditor/xmlsec/src/src/XmlSigner_openssl.h
+450
-11
DesktopEditor/xmlsec/test/OpenSSL_gui_test/OpenSSL_gui_test.pro
...pEditor/xmlsec/test/OpenSSL_gui_test/OpenSSL_gui_test.pro
+3
-3
DesktopEditor/xmlsec/test/openssl_linux/main.cpp
DesktopEditor/xmlsec/test/openssl_linux/main.cpp
+2
-2
No files found.
.gitignore
View file @
227d4f18
...
...
@@ -20,6 +20,7 @@ Common/3dParty/v8/win_32
Common/3dParty/v8/linux_64
Common/3dParty/v8/linux_32
Common/3dParty/v8/mac_64
Common/3dParty/openssl/openssl
**/core_build
**/Release
**/Debug
...
...
Common/3dParty/openssl/build.sh
0 → 100644
View file @
227d4f18
#!/bin/bash
export
PATH
=
`
pwd
`
/depot_tools:
"
$PATH
"
SCRIPT
=
$(
readlink
-f
"
$0
"
)
SCRIPTPATH
=
$(
dirname
"
$SCRIPT
"
)
cd
"
$SCRIPTPATH
"
/openssl
perl ./Configure linux-64
./config
make
Common/3dParty/openssl/fetch.sh
0 → 100644
View file @
227d4f18
#!/bin/bash
SCRIPT
=
$(
readlink
-f
"
$0
"
)
SCRIPTPATH
=
$(
dirname
"
$SCRIPT
"
)
cd
"
$SCRIPTPATH
"
git clone https://github.com/openssl/openssl.git
DesktopEditor/xmlsec/src/include/XmlCertificate.h
View file @
227d4f18
...
...
@@ -8,6 +8,27 @@
#define OOXML_HASH_ALG_SHA1 0
#define OOXML_HASH_ALG_INVALID 1
class
Q_DECL_EXPORT
ICertificateSelectDialogOpenSsl
{
public:
ICertificateSelectDialogOpenSsl
()
{
}
virtual
~
ICertificateSelectDialogOpenSsl
()
{
}
public:
virtual
std
::
wstring
GetCertificatePath
()
=
0
;
virtual
std
::
wstring
GetCertificatePassword
()
=
0
;
virtual
std
::
wstring
GetKeyPath
()
=
0
;
virtual
std
::
wstring
GetKeyPassword
()
=
0
;
virtual
bool
ShowSelectDialog
()
=
0
;
virtual
int
ShowCertificate
()
=
0
;
};
class
Q_DECL_EXPORT
CCertificateInfo
{
public:
...
...
@@ -58,6 +79,8 @@ public:
virtual
bool
ShowSelectDialog
()
=
0
;
virtual
int
ShowCertificate
()
=
0
;
virtual
void
SetOpenSslDialog
(
ICertificateSelectDialogOpenSsl
*
pDialog
)
{}
static
CCertificateInfo
GetDefault
();
static
ICertificate
*
GetById
(
const
std
::
string
&
id
);
...
...
DesktopEditor/xmlsec/src/ooxmlsignature.pro
View file @
227d4f18
...
...
@@ -46,3 +46,13 @@ core_windows {
LIBS
+=
-
lAdvapi32
}
core_linux
{
DEFINES
+=
XMLSEC_OPENSSL_110
INCLUDEPATH
+=
$$
CORE_ROOT_DIR
/
Common
/
3
dParty
/
openssl
/
openssl
/
include
LIBS
+=
-
L
$$
CORE_ROOT_DIR
/
Common
/
3
dParty
/
openssl
/
openssl
-
lssl
LIBS
+=
-
L
$$
CORE_ROOT_DIR
/
Common
/
3
dParty
/
openssl
/
openssl
-
lcrypto
}
DesktopEditor/xmlsec/src/src/XmlSigner_openssl.h
View file @
227d4f18
This diff is collapsed.
Click to expand it.
DesktopEditor/xmlsec/test/OpenSSL_gui_test/OpenSSL_gui_test.pro
View file @
227d4f18
...
...
@@ -27,10 +27,10 @@ core_linux {
DEFINES
+=
XMLSEC_OPENSSL_110
#
DEFINES
+=
"OPENSSL_API_COMPAT=\"
0
x10100000
\
""
INCLUDEPATH
+=
$$
PWD
/../..
/
openssl
/
include
INCLUDEPATH
+=
$$
CORE_ROOT_DIR
/
Common
/
3
dParty
/
openssl
/
openssl
/
include
LIBS
+=
-
L
$$
PWD
/../..
/
openssl
-
lssl
LIBS
+=
-
L
$$
PWD
/../..
/
openssl
-
lcrypto
LIBS
+=
-
L
$$
CORE_ROOT_DIR
/
Common
/
3
dParty
/
openssl
/
openssl
-
lssl
LIBS
+=
-
L
$$
CORE_ROOT_DIR
/
Common
/
3
dParty
/
openssl
/
openssl
-
lcrypto
LIBS
+=
-
ldl
...
...
DesktopEditor/xmlsec/test/openssl_linux/main.cpp
View file @
227d4f18
...
...
@@ -44,7 +44,7 @@ static time_t ASN1_GetTimeT(ASN1_TIME* time)
return
mktime
(
&
t
);
}
#if
0
#if
1
int
main
()
{
std
::
wstring
sFolderW
=
NSFile
::
GetProcessDirectory
();
...
...
@@ -141,7 +141,7 @@ int main()
}
#endif
#if
1
#if
0
int main(int argc, char **argv)
{
std::wstring sFolderW = NSFile::GetProcessDirectory();
...
...
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