diff options
| author | Gabor Kelemen <kelemen.gabor2@nisz.hu> | 2020-04-22 10:25:57 +0200 |
|---|---|---|
| committer | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2020-04-29 11:17:06 +0200 |
| commit | c6b6ac53e71661e1fd8ae2ee99df3eb3ea4bd517 (patch) | |
| tree | ae78f68f889f02f61f91e74674f2f610ff171a3f /sfx2/source | |
| parent | 994526fadb3faeb57c47cf1060a2ad7d53bd4f94 (diff) | |
tdf#131733 Show only CN part of X.509 subject infocp-6.4-branch-point
The problem was that the whole Subject info was returned from
X.509 certs if they did not start with one of "CN", "OU", "O", "E"
Instead of extending this list with random keys, pass the type of cert
and only return the whole Subject info if it's an OpenGPG one, and
process the info unconditionally if it's X.509 like before the OpenGPG
integration
Change-Id: I1aa5d7285e48b0f4a769a073cdfb7732e482792c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92675
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
(cherry picked from commit bedba76adb9b1421a7d939cfef44b8194e987888)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93129
Diffstat (limited to 'sfx2/source')
| -rw-r--r-- | sfx2/source/dialog/dinfdlg.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx index 85d46610b73a..af3459680517 100644 --- a/sfx2/source/dialog/dinfdlg.cxx +++ b/sfx2/source/dialog/dinfdlg.cxx @@ -818,7 +818,7 @@ void SfxDocumentPage::ImplUpdateSignatures() { const security::DocumentSignatureInformation& rInfo = aInfos[ 0 ]; s = utl::GetDateTimeString( rInfo.SignatureDate, rInfo.SignatureTime ) + ", " + - comphelper::xmlsec::GetContentPart(rInfo.Signer->getSubjectName()); + comphelper::xmlsec::GetContentPart(rInfo.Signer->getSubjectName(), rInfo.Signer->getCertificateKind()); } m_xSignedValFt->set_label(s); } |