xmlsecurity/source/xmlsec/mscrypt/oid.hxx | 2 --
xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.cxx | 6 +++---
2 files changed, 3 insertions(+), 5 deletions(-)
New commits:
commit 2741a819156f33b976af7fe857c2e9006ac39f1d
Author: Simon Chenery <simon_chen...@yahoo.com>
AuthorDate: Sat Aug 16 09:59:37 2025 +0200
Commit: David Gilbert <freedesk...@treblig.org>
CommitDate: Tue Aug 26 01:15:41 2025 +0200
tdf#147021 avoid use of SAL_N_ELEMENTS macro in oid.hxx
Also replace for loop that used nOID value with a range-based for loop.
Change-Id: Icb7e53627fe23865600f19c38b1198e46ee3fd23
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/189765
Reviewed-by: David Gilbert <freedesk...@treblig.org>
Tested-by: Jenkins
diff --git a/xmlsecurity/source/xmlsec/mscrypt/oid.hxx
b/xmlsecurity/source/xmlsec/mscrypt/oid.hxx
index ce573d882714..c744aacc83da 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/oid.hxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/oid.hxx
@@ -148,6 +148,4 @@ OIDItem OIDs[] = {
{"1.2.643.2.2.36.0", "GOST_R_34.10-2001_Sign_DH_PRO"}
};
-const int nOID = SAL_N_ELEMENTS(OIDs);
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.cxx
b/xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.cxx
index 05881195312e..49a54e523376 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.cxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.cxx
@@ -460,12 +460,12 @@ void X509Certificate_MSCryptImpl::setRawCert( Sequence<
sal_Int8 > const & rawCe
static OUString findOIDDescription(char const *oid)
{
OUString ouOID = OUString::createFromAscii( oid );
- for (int i=0; i<nOID; i++)
+ for (const auto& entry : OIDs)
{
- OUString item = OUString::createFromAscii( OIDs[i].oid );
+ OUString item = OUString::createFromAscii( entry.oid );
if (ouOID == item)
{
- return OUString::createFromAscii( OIDs[i].desc );
+ return OUString::createFromAscii( entry.desc );
}
}
