diff options
| author | Andrzej J.R. Hunt <andrzej@ahunt.org> | 2013-08-17 15:27:06 +0000 |
|---|---|---|
| committer | Andrzej J.R. Hunt <andrzej@ahunt.org> | 2013-08-17 15:28:01 +0000 |
| commit | 182bf2a63acceb435074e84f1237f1852491be94 (patch) | |
| tree | 66c9e2fce8d19ae8c2801747d86669a85fd91ec8 /xmlsecurity/source/xmlsec | |
| parent | f34881370ac9d9f499e00143ca840ba88021843f (diff) | |
Revert "fdo#57950: Remove some chained appends in xmlsecurity"
This reverts commit 4f20c9f6f95c117bcdb520682df4fa1429a56477
Change-Id: I4d8cef801d570b0c20e580144e79a5940b100271
Reviewed-on: https://gerrit.libreoffice.org/5476
Reviewed-by: Andrzej J.R. Hunt <andrzej@ahunt.org>
Tested-by: Andrzej J.R. Hunt <andrzej@ahunt.org>
Diffstat (limited to 'xmlsecurity/source/xmlsec')
| -rw-r--r-- | xmlsecurity/source/xmlsec/nss/nssinitializer.cxx | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx b/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx index 379ac70d119e..37188d6db948 100644 --- a/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx +++ b/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx @@ -313,11 +313,16 @@ bool nsscrypto_initialize( const css::uno::Reference< css::uno::XComponentContex if (::osl::File::E_None == ::osl::File::getSystemPathFromFileURL(rootModule, rootModulePath)) { OString ospath = OUStringToOString(rootModulePath, osl_getThreadTextEncoding()); - OString aStr = "name=\"" ROOT_CERTS "\" library=\"" + ospath + "\""; + OStringBuffer pkcs11moduleSpec; + pkcs11moduleSpec.append("name=\""); + pkcs11moduleSpec.append(ROOT_CERTS); + pkcs11moduleSpec.append("\" library=\""); + pkcs11moduleSpec.append(ospath.getStr()); + pkcs11moduleSpec.append("\""); SECMODModule * RootsModule = SECMOD_LoadUserModule( - const_cast<char*>(aStr.getStr()), + const_cast<char*>(pkcs11moduleSpec.makeStringAndClear().getStr()), 0, // no parent PR_FALSE); // do not recurse |