diff options
Diffstat (limited to 'xmlsecurity/tools/demo/util2.cxx')
| -rw-r--r-- | xmlsecurity/tools/demo/util2.cxx | 76 |
1 files changed, 38 insertions, 38 deletions
diff --git a/xmlsecurity/tools/demo/util2.cxx b/xmlsecurity/tools/demo/util2.cxx index 5b71f6108e6a..d40506bc498e 100644 --- a/xmlsecurity/tools/demo/util2.cxx +++ b/xmlsecurity/tools/demo/util2.cxx @@ -170,68 +170,68 @@ void convertDateTime( ::rtl::OUStringBuffer& rBuffer, rtl::OUString result; - result += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Security Id : ")) + result += rtl::OUString::createFromAscii( "Security Id : " ) +rtl::OUString::valueOf(infor.nSecurityId) - +rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\n")); - result += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Status : [")) + +rtl::OUString::createFromAscii( "\n" ); + result += rtl::OUString::createFromAscii( "Status : [" ) +rtl::OUString::valueOf((sal_Int32)(infor.nStatus)) - +rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("] ")) + +rtl::OUString::createFromAscii( "] " ) +rtl::OUString::createFromAscii(status[infor.nStatus]) - +rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\n")); + +rtl::OUString::createFromAscii( "\n" ); const SignatureReferenceInformations& rInfors = infor.vSignatureReferenceInfors; int i; int size = rInfors.size(); - result += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("--References :\n")); + result += rtl::OUString::createFromAscii( "--References :\n" ); for (i=0; i<size; i++) { - result += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("---URI : ")); + result += rtl::OUString::createFromAscii( "---URI : " ); result += rInfors[i].ouURI; - result += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\n")); - result += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("---DigestValue : ")); + result += rtl::OUString::createFromAscii( "\n" ); + result += rtl::OUString::createFromAscii( "---DigestValue : " ); result += rInfors[i].ouDigestValue; - result += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\n")); + result += rtl::OUString::createFromAscii( "\n" ); } if (infor.ouX509IssuerName.getLength()>0) { - result += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("--X509IssuerName :\n")); + result += rtl::OUString::createFromAscii( "--X509IssuerName :\n" ); result += infor.ouX509IssuerName; - result += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\n")); + result += rtl::OUString::createFromAscii( "\n" ); } if (infor.ouX509SerialNumber.getLength()>0) { - result += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("--X509SerialNumber :\n")); + result += rtl::OUString::createFromAscii( "--X509SerialNumber :\n" ); result += infor.ouX509SerialNumber; - result += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\n")); + result += rtl::OUString::createFromAscii( "\n" ); } if (infor.ouX509Certificate.getLength()>0) { - result += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("--X509Certificate :\n")); + result += rtl::OUString::createFromAscii( "--X509Certificate :\n" ); result += infor.ouX509Certificate; - result += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\n")); + result += rtl::OUString::createFromAscii( "\n" ); } if (infor.ouSignatureValue.getLength()>0) { - result += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("--SignatureValue :\n")); + result += rtl::OUString::createFromAscii( "--SignatureValue :\n" ); result += infor.ouSignatureValue; - result += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\n")); + result += rtl::OUString::createFromAscii( "\n" ); } - result += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("--Date :\n")); + result += rtl::OUString::createFromAscii( "--Date :\n" ); ::rtl::OUStringBuffer buffer; convertDateTime( buffer, infor.stDateTime ); result += buffer.makeStringAndClear(); - result += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\n")); + result += rtl::OUString::createFromAscii( "\n" ); if (infor.ouX509IssuerName.getLength()>0 && infor.ouX509SerialNumber.getLength()>0 && xSecurityEnvironment.is()) { - result += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("--Certificate Path :\n")); + result += rtl::OUString::createFromAscii( "--Certificate Path :\n" ); cssu::Reference< ::com::sun::star::security::XCertificate > xCert = xSecurityEnvironment->getCertificate( infor.ouX509IssuerName, numericStringToBigInteger(infor.ouX509SerialNumber) ); cssu::Sequence < cssu::Reference< ::com::sun::star::security::XCertificate > > xCertPath; if(! xCert.is() ) @@ -247,68 +247,68 @@ void convertDateTime( ::rtl::OUStringBuffer& rBuffer, for( int i = 0; i < xCertPath.getLength(); i++ ) { result += xCertPath[i]->getSubjectName(); - result += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\n Subject public key algorithm : ")); + result += rtl::OUString::createFromAscii( "\n Subject public key algorithm : " ); result += xCertPath[i]->getSubjectPublicKeyAlgorithm(); - result += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\n Signature algorithm : ")); + result += rtl::OUString::createFromAscii( "\n Signature algorithm : " ); result += xCertPath[i]->getSignatureAlgorithm(); - result += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\n Subject public key value : ")); + result += rtl::OUString::createFromAscii( "\n Subject public key value : " ); cssu::Sequence< sal_Int8 > keyValue = xCertPath[i]->getSubjectPublicKeyValue(); result += printHexString(keyValue); - result += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\n Thumbprint (SHA1) : ")); + result += rtl::OUString::createFromAscii( "\n Thumbprint (SHA1) : " ); cssu::Sequence< sal_Int8 > SHA1Thumbprint = xCertPath[i]->getSHA1Thumbprint(); result += printHexString(SHA1Thumbprint); - result += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\n Thumbprint (MD5) : ")); + result += rtl::OUString::createFromAscii( "\n Thumbprint (MD5) : " ); cssu::Sequence< sal_Int8 > MD5Thumbprint = xCertPath[i]->getMD5Thumbprint(); result += printHexString(MD5Thumbprint); - result += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\n <<\n")); + result += rtl::OUString::createFromAscii( "\n <<\n" ); } - result += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\n Key Usage : ")); + result += rtl::OUString::createFromAscii( "\n Key Usage : " ); sal_Int32 usage = xCert->getCertificateUsage(); if (usage & ::com::sun::star::security::KeyUsage::DIGITAL_SIGNATURE) { - result += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DIGITAL_SIGNATURE ")); + result += rtl::OUString::createFromAscii( "DIGITAL_SIGNATURE " ); } if (usage & ::com::sun::star::security::KeyUsage::NON_REPUDIATION) { - result += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NON_REPUDIATION ")); + result += rtl::OUString::createFromAscii( "NON_REPUDIATION " ); } if (usage & ::com::sun::star::security::KeyUsage::KEY_ENCIPHERMENT) { - result += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("KEY_ENCIPHERMENT ")); + result += rtl::OUString::createFromAscii( "KEY_ENCIPHERMENT " ); } if (usage & ::com::sun::star::security::KeyUsage::DATA_ENCIPHERMENT) { - result += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DATA_ENCIPHERMENT ")); + result += rtl::OUString::createFromAscii( "DATA_ENCIPHERMENT " ); } if (usage & ::com::sun::star::security::KeyUsage::KEY_AGREEMENT) { - result += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("KEY_AGREEMENT ")); + result += rtl::OUString::createFromAscii( "KEY_AGREEMENT " ); } if (usage & ::com::sun::star::security::KeyUsage::KEY_CERT_SIGN) { - result += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("KEY_CERT_SIGN ")); + result += rtl::OUString::createFromAscii( "KEY_CERT_SIGN " ); } if (usage & ::com::sun::star::security::KeyUsage::CRL_SIGN) { - result += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CRL_SIGN ")); + result += rtl::OUString::createFromAscii( "CRL_SIGN " ); } - result += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\n")); + result += rtl::OUString::createFromAscii( "\n" ); } - result += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\n")); + result += rtl::OUString::createFromAscii( "\n" ); return result; } @@ -326,7 +326,7 @@ void convertDateTime( ::rtl::OUStringBuffer& rBuffer, result += getSignatureInformation( infor, xSecurityEnvironment ); } - result += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\n")); + result += rtl::OUString::createFromAscii( "\n" ); return result; } |