diff options
| author | Carl Hetherington <cth@carlh.net> | 2019-01-24 17:34:37 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2019-01-24 17:34:37 +0000 |
| commit | 2d05cab0e47ef437c3e5fa0f574f1eb4b1cfd64a (patch) | |
| tree | f5b0836171141088a0cb19a8e986a0005621a378 /src/certificate_chain.cc | |
| parent | 8cbeb8c52ba1a91ec9c6517c2557fabada9f10c2 (diff) | |
Slightly hacky but hopefully functional fix for KDMs after the changes
to signer. The KDM stuff uses add_signature_value() but not sign()
since it has to allow pass-through of a KDM (so it handles <Signature> etc.
itself). This means we have to make the indentation-adding optional.
It might have been nicer to make indent() not add indentation if it's
not already there.
Diffstat (limited to 'src/certificate_chain.cc')
| -rw-r--r-- | src/certificate_chain.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/certificate_chain.cc b/src/certificate_chain.cc index 353444fa..61414436 100644 --- a/src/certificate_chain.cc +++ b/src/certificate_chain.cc @@ -603,7 +603,7 @@ CertificateChain::sign (xmlpp::Element* parent, Standard standard) const signature->add_child("SignatureValue", "dsig"); signature->add_child("KeyInfo", "dsig"); - add_signature_value (signature, "dsig"); + add_signature_value (signature, "dsig", true); } @@ -613,7 +613,7 @@ CertificateChain::sign (xmlpp::Element* parent, Standard standard) const * @param ns Namespace to use for the signature XML nodes. */ void -CertificateChain::add_signature_value (xmlpp::Element* parent, string ns) const +CertificateChain::add_signature_value (xmlpp::Element* parent, string ns, bool add_indentation) const { cxml::Node cp (parent); xmlpp::Node* key_info = cp.node_child("KeyInfo")->node (); @@ -644,7 +644,9 @@ CertificateChain::add_signature_value (xmlpp::Element* parent, string ns) const throw runtime_error ("could not read private key"); } - indent (parent, 2); + if (add_indentation) { + indent (parent, 2); + } int const r = xmlSecDSigCtxSign (signature_context, parent->cobj ()); if (r < 0) { throw MiscError (String::compose ("could not sign (%1)", r)); |