strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS xmlsec10 (1.10.4); FILE MERGED

Browse source 
2005/03/23 09:52:53 mmi 1.10.4.1: idl review
Issue number:
Submitted by:
Reviewed by:
This commit is contained in:
Rüdiger Timm 2005-03-29 12:26:22 +00:00
parent 4660fb326a
commit d8955c7c14
1 changed files with 23 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx
View file

@ -2,9 +2,9 @@
* *
* $RCSfile: securityenvironment_nssimpl.cxx,v $ * $RCSfile: securityenvironment_nssimpl.cxx,v $
* *
* $Revision: 1.10 $ * $Revision: 1.11 $
* *
* last change: $Author: vg $ $Date: 2005-03-10 18:12:42 $ * last change: $Author: rt $ $Date: 2005-03-29 13:26:22 $
* *
* 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
@ -288,7 +288,7 @@ PK11SlotInfo* SecurityEnvironment_NssImpl :: getCryptoSlot() throw( Exception ,
return m_pSlot ; return m_pSlot ;
} }
::rtl::OUString SecurityEnvironment_NssImpl::getSecurityEnvironmentInfo() throw( ::com::sun::star::uno::RuntimeException ) ::rtl::OUString SecurityEnvironment_NssImpl::getSecurityEnvironmentInformation() throw( ::com::sun::star::uno::RuntimeException )
{ {
rtl::OUString result; rtl::OUString result;
@ -802,7 +802,7 @@ sal_Int32 SecurityEnvironment_NssImpl :: verifyCertificate( const ::com::sun::st
if( status == SECSuccess ) { if( status == SECSuccess ) {
validity = 0x00000000 ; validity = 0x00000000 ;
} else { } else {
validity = ::com::sun::star::security::CertificateValidity::CERT_VALIDITY_INVALID ; validity = ::com::sun::star::security::CertificateValidity::INVALID ;
#if ( __GNUC__ == 3 && __GNUC_MINOR__ == 4 ) #if ( __GNUC__ == 3 && __GNUC_MINOR__ == 4 )
// Gcc-3.4.1 has a serious bug which prevents compiling this switch construct, // Gcc-3.4.1 has a serious bug which prevents compiling this switch construct,
// if "status" in the switch statement is a signed integer type. // if "status" in the switch statement is a signed integer type.
@ -814,42 +814,42 @@ sal_Int32 SecurityEnvironment_NssImpl :: verifyCertificate( const ::com::sun::st
switch( status ) { switch( status ) {
#endif #endif
case SEC_ERROR_BAD_SIGNATURE : case SEC_ERROR_BAD_SIGNATURE :
validity |= ::com::sun::star::security::CertificateValidity::CERT_VALIDITY_SIGNATURE_INVALID ; validity |= ::com::sun::star::security::CertificateValidity::SIGNATURE_INVALID ;
break ; break ;
case SEC_ERROR_EXPIRED_CERTIFICATE : case SEC_ERROR_EXPIRED_CERTIFICATE :
validity |= ::com::sun::star::security::CertificateValidity::CERT_VALIDITY_TIMEOUT ; validity |= ::com::sun::star::security::CertificateValidity::TIMEOUT ;
break ; break ;
case SEC_ERROR_REVOKED_CERTIFICATE : case SEC_ERROR_REVOKED_CERTIFICATE :
validity |= ::com::sun::star::security::CertificateValidity::CERT_VALIDITY_REVOKED ; validity |= ::com::sun::star::security::CertificateValidity::REVOKED ;
break ; break ;
case SEC_ERROR_UNKNOWN_ISSUER : case SEC_ERROR_UNKNOWN_ISSUER :
validity |= ::com::sun::star::security::CertificateValidity::CERT_VALIDITY_ISSUER_UNKNOWN ; validity |= ::com::sun::star::security::CertificateValidity::ISSUER_UNKNOWN ;
break ; break ;
case SEC_ERROR_UNTRUSTED_ISSUER : case SEC_ERROR_UNTRUSTED_ISSUER :
validity |= ::com::sun::star::security::CertificateValidity::CERT_VALIDITY_ISSUER_UNTRUSTED ; validity |= ::com::sun::star::security::CertificateValidity::ISSUER_UNTRUSTED ;
break ; break ;
case SEC_ERROR_UNTRUSTED_CERT : case SEC_ERROR_UNTRUSTED_CERT :
validity |= ::com::sun::star::security::CertificateValidity::CERT_VALIDITY_UNTRUSTED ; validity |= ::com::sun::star::security::CertificateValidity::UNTRUSTED ;
break ; break ;
case SEC_ERROR_CERT_VALID : case SEC_ERROR_CERT_VALID :
case SEC_ERROR_CERT_NOT_VALID : case SEC_ERROR_CERT_NOT_VALID :
break ; break ;
case SEC_ERROR_EXPIRED_ISSUER_CERTIFICATE : case SEC_ERROR_EXPIRED_ISSUER_CERTIFICATE :
validity |= ::com::sun::star::security::CertificateValidity::CERT_VALIDITY_ISSUER_INVALID ; validity |= ::com::sun::star::security::CertificateValidity::ISSUER_INVALID ;
break ; break ;
case SEC_ERROR_CA_CERT_INVALID : case SEC_ERROR_CA_CERT_INVALID :
validity |= ::com::sun::star::security::CertificateValidity::CERT_VALIDITY_ROOT_INVALID ; validity |= ::com::sun::star::security::CertificateValidity::ROOT_INVALID ;
break ; break ;
case SEC_ERROR_UNKNOWN_CRITICAL_EXTENSION : case SEC_ERROR_UNKNOWN_CRITICAL_EXTENSION :
validity |= ::com::sun::star::security::CertificateValidity::CERT_VALIDITY_EXTENSION_INVALID ; validity |= ::com::sun::star::security::CertificateValidity::EXTENSION_INVALID ;
break ; break ;
case SEC_ERROR_UNKNOWN_CERT : case SEC_ERROR_UNKNOWN_CERT :
validity |= ::com::sun::star::security::CertificateValidity::CERT_VALIDITY_CHAIN_INCOMPLETE ; validity |= ::com::sun::star::security::CertificateValidity::CHAIN_INCOMPLETE ;
break ; break ;
} }
} }
} else { } else {
validity = ::com::sun::star::security::CertificateValidity::CERT_VALIDITY_INVALID ; validity = ::com::sun::star::security::CertificateValidity::INVALID ;
} }
return validity ; return validity ;
@ -876,9 +876,9 @@ sal_Int32 SecurityEnvironment_NssImpl :: getCertificateCharacters( const ::com::
//Firstly, make sentence whether or not the cert is self-signed. //Firstly, make sentence whether or not the cert is self-signed.
if( SECITEM_CompareItem( &(cert->derIssuer), &(cert->derSubject) ) == SECEqual ) { if( SECITEM_CompareItem( &(cert->derIssuer), &(cert->derSubject) ) == SECEqual ) {
characters |= ::com::sun::star::security::CertificateCharacters::CERT_CHARACTER_SELF_SIGNED ; characters |= ::com::sun::star::security::CertificateCharacters::SELF_SIGNED ;
} else { } else {
characters &= ~ ::com::sun::star::security::CertificateCharacters::CERT_CHARACTER_SELF_SIGNED ; characters &= ~ ::com::sun::star::security::CertificateCharacters::SELF_SIGNED ;
} }
//Secondly, make sentence whether or not the cert has a private key. //Secondly, make sentence whether or not the cert has a private key.
@ -900,11 +900,11 @@ sal_Int32 SecurityEnvironment_NssImpl :: getCertificateCharacters( const ::com::
priKey = PK11_FindPrivateKeyFromCert( m_pSlot, ( CERTCertificate* )cert, NULL ) ; priKey = PK11_FindPrivateKeyFromCert( m_pSlot, ( CERTCertificate* )cert, NULL ) ;
if( priKey != NULL ) { if( priKey != NULL ) {
characters |= ::com::sun::star::security::CertificateCharacters::CERT_CHARACTER_HAS_PRIVATE_KEY ; characters |= ::com::sun::star::security::CertificateCharacters::HAS_PRIVATE_KEY ;
SECKEY_DestroyPrivateKey( priKey ) ; SECKEY_DestroyPrivateKey( priKey ) ;
} else { } else {
characters &= ~ ::com::sun::star::security::CertificateCharacters::CERT_CHARACTER_HAS_PRIVATE_KEY ; characters &= ~ ::com::sun::star::security::CertificateCharacters::HAS_PRIVATE_KEY ;
} }
} }
@ -928,10 +928,10 @@ sal_Int32 SecurityEnvironment_NssImpl :: getCertificateCharacters( const ::com::
tempCert = NULL ; tempCert = NULL ;
if( tempCert != NULL ) { if( tempCert != NULL ) {
characters |= ::com::sun::star::security::CertificateCharacters::CERT_CHARACTER_TRUSTED ; characters |= ::com::sun::star::security::CertificateCharacters::TRUSTED ;
CERT_DestroyCertificate( tempCert ) ; CERT_DestroyCertificate( tempCert ) ;
} else { } else {
characters &= ~ ::com::sun::star::security::CertificateCharacters::CERT_CHARACTER_TRUSTED ; characters &= ~ ::com::sun::star::security::CertificateCharacters::TRUSTED ;
} }
} }
*/ */
@ -945,10 +945,10 @@ sal_Int32 SecurityEnvironment_NssImpl :: getCertificateCharacters( const ::com::
tempCert = NULL ; tempCert = NULL ;
if( tempCert != NULL ) { if( tempCert != NULL ) {
characters |= ::com::sun::star::security::CertificateCharacters::CERT_CHARACTER_TRUSTED ; characters |= ::com::sun::star::security::CertificateCharacters::TRUSTED ;
CERT_DestroyCertificate( tempCert ) ; CERT_DestroyCertificate( tempCert ) ;
} else { } else {
characters &= ~ ::com::sun::star::security::CertificateCharacters::CERT_CHARACTER_TRUSTED ; characters &= ~ ::com::sun::star::security::CertificateCharacters::TRUSTED ;
} }
} }