pengjunjie/core
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/core.git synced 2026-04-07 13:55:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

verify cert (openssl only)

Browse Source
This commit is contained in:
Oleg Korshul
2017-06-16 15:07:35 +03:00
parent c389801937
commit a505ae391d
5 changed files with 43 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
DesktopEditor/xmlsec/src/include/XmlCertificate.h
View File

@ -12,6 +12,7 @@
#define OPEN_SSL_WARNING_ERR 1
#define OPEN_SSL_WARNING_ALL_OK 2
#define OPEN_SSL_WARNING_PASS 4
#define OPEN_SSL_WARNING_NOVERIFY 8
class ICertificate;
class Q_DECL_EXPORT ICertificateSelectDialogOpenSsl
@ -102,6 +103,7 @@ public:
virtual std::string GetDate() = 0;
virtual std::string GetId() = 0;
virtual int VerifySelf() = 0;
public:
virtual std::string Sign(const std::string& sXml) = 0;

8
DesktopEditor/xmlsec/src/src/OOXMLVerifier.cpp
View File

@ -248,7 +248,13 @@ public:
std::string sSignatureValue = U_TO_UTF8((m_node.ReadValueString(L"SignatureValue")));
if (!m_cert->Verify(sSignatureCalcValue, sSignatureValue, nSignatureMethod))
m_valid = OOXML_SIGNATURE_INVALID;
m_valid = OOXML_SIGNATURE_INVALID;
else
{
int nCertVerify = m_cert->VerifySelf();
if (OPEN_SSL_WARNING_NOVERIFY == nCertVerify)
m_valid = OOXML_SIGNATURE_INVALID;
}
}
XmlUtils::CXmlNode GetObjectById(std::string sId)

5
DesktopEditor/xmlsec/src/src/XmlSigner_mscrypto.h
View File

@ -131,6 +131,11 @@ public:
return GetNumber();
}
virtual int VerifySelf()
{
return OPEN_SSL_WARNING_OK;
}
public:
virtual std::string Sign(const std::string& sXml)
{

27
DesktopEditor/xmlsec/src/src/XmlSigner_openssl.cpp
View File

@ -328,6 +328,7 @@ public:
RELEASEARRAYOBJECTS(pData);
return (NULL == m_cert) ? false : true;
}
return false;
}
@ -424,6 +425,27 @@ public:
m_pDialog = pDialog;
}
int VerifySelf()
{
if (NULL == m_cert)
return OPEN_SSL_WARNING_NOVERIFY;
X509_STORE_CTX* ctx = X509_STORE_CTX_new();
X509_STORE* store = X509_STORE_new();
X509_STORE_add_cert(store, m_cert);
X509_STORE_CTX_init(ctx, store, m_cert, NULL);
int status = X509_verify_cert(ctx);
int nErr = X509_STORE_CTX_get_error(ctx);
std::string sErr(X509_verify_cert_error_string(nErr));
X509_STORE_free(store);
X509_STORE_CTX_free(ctx);
return (1 == status) ? OPEN_SSL_WARNING_OK : OPEN_SSL_WARNING_NOVERIFY;
}
protected:
tm ASN1_GetTimeT(ASN1_TIME* time)
{
@ -716,6 +738,11 @@ std::string CCertificate_openssl::GetId()
return m_internal->GetId();
}
int CCertificate_openssl::VerifySelf()
{
return m_internal->VerifySelf();
}
std::string CCertificate_openssl::Sign(const std::string& sXml)
{
return m_internal->Sign(sXml);

2
DesktopEditor/xmlsec/src/src/XmlSigner_openssl.h
View File

@ -26,6 +26,8 @@ public:
virtual std::string GetId();
virtual int VerifySelf();
public:
virtual std::string Sign(const std::string& sXml);