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 07:05:36 +0200 |
| commit | bedba76adb9b1421a7d939cfef44b8194e987888 (patch) | |
| tree | e7a6925910d17e62c9ed7814b59dd6f98d86e7e9 /include | |
| parent | 14fef320301f71f68547af1c0527677cc0ef6f88 (diff) | |
tdf#131733 Show only CN part of X.509 subject info
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>
Diffstat (limited to 'include')
| -rw-r--r-- | include/comphelper/xmlsechelper.hxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/comphelper/xmlsechelper.hxx b/include/comphelper/xmlsechelper.hxx index ba702fa683c6..5bf3add901f1 100644 --- a/include/comphelper/xmlsechelper.hxx +++ b/include/comphelper/xmlsechelper.hxx @@ -36,7 +36,8 @@ COMPHELPER_DLLPUBLIC OUString GetCertificateKind(const css::security::Certificat COMPHELPER_DLLPUBLIC std::vector<std::pair<OUString, OUString>> parseDN(const OUString& rRawString); COMPHELPER_DLLPUBLIC std::pair<OUString, OUString> GetDNForCertDetailsView(const OUString& rRawString); -COMPHELPER_DLLPUBLIC OUString GetContentPart(const OUString& _rRawString); +COMPHELPER_DLLPUBLIC OUString GetContentPart(const OUString& _rRawString, + const css::security::CertificateKind& rKind); COMPHELPER_DLLPUBLIC OUString GetHexString(const css::uno::Sequence<sal_Int8>& _rSeq, const char* _pSep, sal_uInt16 _nLineBreak = 0xFFFF); |