diff options
Diffstat (limited to 'src/certificate_chain.cc')
| -rw-r--r-- | src/certificate_chain.cc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/certificate_chain.cc b/src/certificate_chain.cc index 006d26b2..4d90a44d 100644 --- a/src/certificate_chain.cc +++ b/src/certificate_chain.cc @@ -114,7 +114,7 @@ command (string cmd) int const code = WEXITSTATUS (r); #endif if (code) { - throw dcp::MiscError (String::compose ("error %1 in %2 within %3", code, cmd, boost::filesystem::current_path().string())); + throw dcp::MiscError (compose("error %1 in %2 within %3", code, cmd, boost::filesystem::current_path().string())); } } @@ -130,7 +130,7 @@ public_key_digest (boost::filesystem::path private_key, boost::filesystem::path boost::filesystem::path public_name = private_key.string() + ".public"; /* Create the public key from the private key */ - command (String::compose("\"%1\" rsa -outform PEM -pubout -in %2 -out %3", openssl.string(), private_key.string(), public_name.string())); + command (compose("\"%1\" rsa -outform PEM -pubout -in %2 -out %3", openssl.string(), private_key.string(), public_name.string())); /* Read in the public key from the file */ @@ -231,7 +231,7 @@ CertificateChain::CertificateChain ( { command ( - String::compose ( + compose( "%1 req -new -x509 -sha256 -config ca.cnf -days %2 -set_serial 5" " -subj \"%3\" -key ca.key -outform PEM -out ca.self-signed.pem", quoted_openssl, days, ca_subject @@ -265,7 +265,7 @@ CertificateChain::CertificateChain ( { command ( - String::compose ( + compose( "%1 req -new -config intermediate.cnf -days %2 -subj \"%3\" -key intermediate.key -out intermediate.csr", quoted_openssl, days - 1, inter_subject ) @@ -273,7 +273,7 @@ CertificateChain::CertificateChain ( } command ( - String::compose ( + compose( "%1 x509 -req -sha256 -days %2 -CA ca.self-signed.pem -CAkey ca.key -set_serial 6" " -in intermediate.csr -extfile intermediate.cnf -extensions v3_ca -out intermediate.signed.pem", quoted_openssl, days - 1 @@ -306,7 +306,7 @@ CertificateChain::CertificateChain ( { command ( - String::compose ( + compose( "%1 req -new -config leaf.cnf -days %2 -subj \"%3\" -key leaf.key -outform PEM -out leaf.csr", quoted_openssl, days - 2, leaf_subject ) @@ -314,7 +314,7 @@ CertificateChain::CertificateChain ( } command ( - String::compose ( + compose( "%1 x509 -req -sha256 -days %2 -CA intermediate.signed.pem -CAkey intermediate.key" " -set_serial 7 -in leaf.csr -extfile leaf.cnf -extensions v3_ca -out leaf.signed.pem", quoted_openssl, days - 2 @@ -659,7 +659,7 @@ CertificateChain::add_signature_value (xmlpp::Element* parent, string ns, bool a } int const r = xmlSecDSigCtxSign (signature_context, parent->cobj ()); if (r < 0) { - throw MiscError (String::compose ("could not sign (%1)", r)); + throw MiscError (compose("could not sign (%1)", r)); } xmlSecDSigCtxDestroy (signature_context); |