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

INTEGRATION: CWS xmlsec13 (1.3.24); FILE MERGED

Browse source 
2005/10/31 13:37:40 jl 1.3.24.2: RESYNC: (1.3-1.4); FILE MERGED
2005/10/25 08:19:19 jl 1.3.24.1: #54495# #54047# extra verification of certificates, better errorhandling
This commit is contained in:
Rüdiger Timm 2005-11-11 08:19:09 +00:00
parent 0ad333df38
commit 0e2341d732
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
xmlsecurity/source/xmlsec/certvalidity.cxx
View file

@ -4,9 +4,9 @@
* *
* $RCSfile: certvalidity.cxx,v $ * $RCSfile: certvalidity.cxx,v $
* *
* $Revision: 1.4 $ * $Revision: 1.5 $
* *
* last change: $Author: rt $ $Date: 2005-09-09 17:25:39 $ * last change: $Author: rt $ $Date: 2005-11-11 09:19:09 $
* *
* The Contents of this file are made available subject to * The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1. * the terms of GNU Lesser General Public License Version 2.1.
@ -45,7 +45,8 @@ using namespace ::com::sun::star::security ;
#define VALID_STR "valid certificate" #define VALID_STR "valid certificate"
#define INVALID_STR "invalid certificate" #define INVALID_STR "invalid certificate"
#define UNTRUSTED_STR "untrusted certificate" #define UNTRUSTED_STR "untrusted certificate"
#define TIMEOUT_STR "expired certificate" #define TIME_INVALID_STR "expired certificate"
#define NOT_NESTED_TIME_STR "invalid time nesting"
#define REVOKED_STR "revoked certificate" #define REVOKED_STR "revoked certificate"
#define UNKNOWN_REVOKATION_STR "unknown certificate revocation status" #define UNKNOWN_REVOKATION_STR "unknown certificate revocation status"
#define SIGNATURE_INVALID_STR "invalid certificate signature" #define SIGNATURE_INVALID_STR "invalid certificate signature"
@ -62,14 +63,16 @@ using namespace ::com::sun::star::security ;
rtl::OUString certificateValidityToOUString( ::sal_Int32 certValidity ) { rtl::OUString certificateValidityToOUString( ::sal_Int32 certValidity ) {
OUString aValidity ; OUString aValidity ;
if( !certValidity ) { if( (certValidity & CertificateValidity::VALID) == CertificateValidity::VALID ) {
aValidity = OUString::createFromAscii( ( const char* )VALID_STR ) ; aValidity = OUString::createFromAscii( ( const char* )VALID_STR ) ;
} else if( ( certValidity & CertificateValidity::INVALID ) == CertificateValidity::INVALID ) { } else if( ( certValidity & CertificateValidity::INVALID ) == CertificateValidity::INVALID ) {
aValidity = OUString::createFromAscii( ( const char* )INVALID_STR ) ; aValidity = OUString::createFromAscii( ( const char* )INVALID_STR ) ;
} else if( ( certValidity & CertificateValidity::UNTRUSTED ) == CertificateValidity::UNTRUSTED ) { } else if( ( certValidity & CertificateValidity::UNTRUSTED ) == CertificateValidity::UNTRUSTED ) {
aValidity = OUString::createFromAscii( ( const char* )UNTRUSTED_STR ) ; aValidity = OUString::createFromAscii( ( const char* )UNTRUSTED_STR ) ;
} else if( ( certValidity & CertificateValidity::TIMEOUT ) == CertificateValidity::TIMEOUT ) { } else if( ( certValidity & CertificateValidity::TIME_INVALID ) == CertificateValidity::TIME_INVALID ) {
aValidity = OUString::createFromAscii( ( const char* )TIMEOUT_STR ) ; aValidity = OUString::createFromAscii( ( const char* )TIME_INVALID_STR ) ;
} else if( ( certValidity & CertificateValidity::NOT_TIME_NESTED ) == CertificateValidity::NOT_TIME_NESTED ) {
aValidity = OUString::createFromAscii( ( const char* )NOT_NESTED_TIME_STR ) ;
} else if( ( certValidity & CertificateValidity::REVOKED ) == CertificateValidity::REVOKED ) { } else if( ( certValidity & CertificateValidity::REVOKED ) == CertificateValidity::REVOKED ) {
aValidity = OUString::createFromAscii( ( const char* )REVOKED_STR ) ; aValidity = OUString::createFromAscii( ( const char* )REVOKED_STR ) ;
} else if( ( certValidity & CertificateValidity::UNKNOWN_REVOKATION ) == CertificateValidity::UNKNOWN_REVOKATION ) { } else if( ( certValidity & CertificateValidity::UNKNOWN_REVOKATION ) == CertificateValidity::UNKNOWN_REVOKATION ) {