diff options
author | Vladimir Glazounov <vg@openoffice.org> | 2006-04-07 10:57:34 +0000 |
---|---|---|
committer | Vladimir Glazounov <vg@openoffice.org> | 2006-04-07 10:57:34 +0000 |
commit | e6c4fcdd84a7f508c4f5a63fbe0333f0ad75c0f1 (patch) | |
tree | 41d820d4ce17b66668c5a85a9ea123363744f694 /xmlsecurity/source/helper | |
parent | ea39c7ce91ec25472bf8674fa0c625a1cb9e1df8 (diff) |
INTEGRATION: CWS jl32 (1.7.48); FILE MERGED
2006/03/20 10:59:59 jl 1.7.48.1: #i62684# certain Certificates do not work (utf8 encoded, using special characters)
Diffstat (limited to 'xmlsecurity/source/helper')
-rw-r--r-- | xmlsecurity/source/helper/xsecsign.cxx | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/xmlsecurity/source/helper/xsecsign.cxx b/xmlsecurity/source/helper/xsecsign.cxx index fe8941999afc..747a1defbdd9 100644 --- a/xmlsecurity/source/helper/xsecsign.cxx +++ b/xmlsecurity/source/helper/xsecsign.cxx @@ -4,9 +4,9 @@ * * $RCSfile: xsecsign.cxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: rt $ $Date: 2005-09-09 17:24:01 $ + * last change: $Author: vg $ $Date: 2006-04-07 11:57:34 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -254,16 +254,18 @@ void XSecController::signAStream( sal_Int32 securityId, const rtl::OUString& uri void XSecController::setX509Certificate( sal_Int32 nSecurityId, const rtl::OUString& ouX509IssuerName, - const rtl::OUString& ouX509SerialNumber) + const rtl::OUString& ouX509SerialNumber, + const rtl::OUString& ouX509Cert) { - setX509Certificate(nSecurityId, -1, ouX509IssuerName, ouX509SerialNumber); + setX509Certificate(nSecurityId, -1, ouX509IssuerName, ouX509SerialNumber, ouX509Cert); } void XSecController::setX509Certificate( sal_Int32 nSecurityId, const sal_Int32 nSecurityEnvironmentIndex, const rtl::OUString& ouX509IssuerName, - const rtl::OUString& ouX509SerialNumber) + const rtl::OUString& ouX509SerialNumber, + const rtl::OUString& ouX509Cert) { int index = findSignatureInfor( nSecurityId ); @@ -273,6 +275,7 @@ void XSecController::setX509Certificate( isi.signatureInfor.nSecurityEnvironmentIndex = nSecurityEnvironmentIndex; isi.signatureInfor.ouX509IssuerName = ouX509IssuerName; isi.signatureInfor.ouX509SerialNumber = ouX509SerialNumber; + isi.signatureInfor.ouX509Certificate = ouX509Cert; m_vInternalSignatureInformations.push_back( isi ); } else @@ -281,6 +284,7 @@ void XSecController::setX509Certificate( = m_vInternalSignatureInformations[index].signatureInfor; si.ouX509IssuerName = ouX509IssuerName; si.ouX509SerialNumber = ouX509SerialNumber; + si.ouX509Certificate = ouX509Cert; si.nSecurityEnvironmentIndex = nSecurityEnvironmentIndex; } } |