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
f6d9ce83
Commit
f6d9ce83
authored
Jun 13, 2017
by
Oleg Korshul
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
.
parent
03edd408
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
6 deletions
+5
-6
DesktopEditor/xmlsec/src/include/XmlCertificate.h
DesktopEditor/xmlsec/src/include/XmlCertificate.h
+3
-0
DesktopEditor/xmlsec/src/src/XmlSigner_openssl.cpp
DesktopEditor/xmlsec/src/src/XmlSigner_openssl.cpp
+2
-2
DesktopEditor/xmlsec/src/src/XmlSigner_openssl.h
DesktopEditor/xmlsec/src/src/XmlSigner_openssl.h
+0
-4
No files found.
DesktopEditor/xmlsec/src/include/XmlCertificate.h
View file @
f6d9ce83
...
...
@@ -33,6 +33,9 @@ public:
virtual
bool
ShowSelectDialog
()
=
0
;
virtual
int
ShowCertificate
(
ICertificate
*
pCert
)
=
0
;
static
int
LoadKey
(
std
::
wstring
file
,
std
::
string
password
);
static
int
LoadCert
(
std
::
wstring
file
,
std
::
string
password
);
};
class
Q_DECL_EXPORT
CCertificateInfo
...
...
DesktopEditor/xmlsec/src/src/XmlSigner_openssl.cpp
View file @
f6d9ce83
...
...
@@ -652,12 +652,12 @@ void CCertificate_openssl::SetOpenSslDialog(ICertificateSelectDialogOpenSsl* pDi
return
m_internal
->
SetOpenSslDialog
(
pDialog
);
}
int
LoadKey
(
std
::
wstring
file
,
std
::
string
password
)
int
ICertificateSelectDialogOpenSsl
::
LoadKey
(
std
::
wstring
file
,
std
::
string
password
)
{
return
CCertificate_openssl_private
::
LoadKey
(
file
,
password
,
NULL
);
}
int
LoadCert
(
std
::
wstring
file
,
std
::
string
password
)
int
ICertificateSelectDialogOpenSsl
::
LoadCert
(
std
::
wstring
file
,
std
::
string
password
)
{
return
CCertificate_openssl_private
::
LoadCert
(
file
,
password
,
NULL
);
}
DesktopEditor/xmlsec/src/src/XmlSigner_openssl.h
View file @
f6d9ce83
...
...
@@ -44,10 +44,6 @@ public:
virtual
int
ShowCertificate
();
virtual
void
SetOpenSslDialog
(
ICertificateSelectDialogOpenSsl
*
pDialog
);
public:
static
int
LoadKey
(
std
::
wstring
file
,
std
::
string
password
);
static
int
LoadCert
(
std
::
wstring
file
,
std
::
string
password
);
};
#endif // _XMLSIGNER_OPENSSL_H_
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