mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

improve algorithm description

Browse Source 
Issue number:
Submitted by:
Reviewed by:
This commit is contained in:
Michael Mi
2004-07-14 09:28:28 +00:00
parent b692bf169d
commit e6e127b5a1
1 changed files with 23 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.cxx
View File

@@ -2,9 +2,9 @@
* *
* $RCSfile: x509certificate_mscryptimpl.cxx,v $ * $RCSfile: x509certificate_mscryptimpl.cxx,v $
* *
* $Revision: 1.2 $ * $Revision: 1.3 $
* *
* last change: $Author: mmi $ $Date: 2004-07-14 08:12:25 $ * last change: $Author: mmi $ $Date: 2004-07-14 10:28:28 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
@@ -75,6 +75,10 @@
#include "certificateextension_xmlsecimpl.hxx" #include "certificateextension_xmlsecimpl.hxx"
#endif #endif
//MM : added by MM
#include "oid.hxx"
//MM : end
using namespace ::com::sun::star::uno ; using namespace ::com::sun::star::uno ;
using namespace ::com::sun::star::security ; using namespace ::com::sun::star::security ;
using ::rtl::OUString ; using ::rtl::OUString ;
@@ -391,13 +395,28 @@ X509Certificate_MSCryptImpl* X509Certificate_MSCryptImpl :: getImplementation( c
} }
// MM : added by MM // MM : added by MM
::rtl::OUString findOIDDescription(char *oid)
{
OUString ouOID = OUString::createFromAscii( oid );
for (int i=0; i<nOID; i++)
{
OUString item = OUString::createFromAscii( OIDs[i].oid );
if (ouOID == item)
{
return OUString::createFromAscii( OIDs[i].desc );
}
}
return OUString() ;
}
::rtl::OUString SAL_CALL X509Certificate_MSCryptImpl::getSubjectPublicKeyAlgorithm() ::rtl::OUString SAL_CALL X509Certificate_MSCryptImpl::getSubjectPublicKeyAlgorithm()
throw ( ::com::sun::star::uno::RuntimeException) throw ( ::com::sun::star::uno::RuntimeException)
{ {
if( m_pCertContext != NULL && m_pCertContext->pCertInfo != NULL ) if( m_pCertContext != NULL && m_pCertContext->pCertInfo != NULL )
{ {
CRYPT_ALGORITHM_IDENTIFIER algorithm = m_pCertContext->pCertInfo->SubjectPublicKeyInfo.Algorithm; CRYPT_ALGORITHM_IDENTIFIER algorithm = m_pCertContext->pCertInfo->SubjectPublicKeyInfo.Algorithm;
return OUString::createFromAscii( algorithm.pszObjId ) ; return findOIDDescription( algorithm.pszObjId ) ;
} }
else else
{ {
@@ -432,7 +451,7 @@ X509Certificate_MSCryptImpl* X509Certificate_MSCryptImpl :: getImplementation( c
if( m_pCertContext != NULL && m_pCertContext->pCertInfo != NULL ) if( m_pCertContext != NULL && m_pCertContext->pCertInfo != NULL )
{ {
CRYPT_ALGORITHM_IDENTIFIER algorithm = m_pCertContext->pCertInfo->SignatureAlgorithm; CRYPT_ALGORITHM_IDENTIFIER algorithm = m_pCertContext->pCertInfo->SignatureAlgorithm;
return OUString::createFromAscii( algorithm.pszObjId ) ; return findOIDDescription( algorithm.pszObjId ) ;
} }
else else
{ {