https://issues.shibboleth.net/jira/browse/CPPOST-86

[shibboleth/cpp-opensaml.git] / samlsign / samlsign.cpp

diff --git a/samlsign/samlsign.cpp b/samlsign/samlsign.cpp
index 27f4a2c..a86fdeb 100644 (file)
--- a/samlsign/samlsign.cpp
+++ b/samlsign/samlsign.cpp
@@ -363,15 +363,15 @@ int main(int argc,char* argv[])
 
             // Attach new signature.
             Signature* sig = SignatureBuilder::buildSignature();
-            if (alg_param) {
-                auto_ptr_XMLCh alg(alg_param);
+            signable->setSignature(sig);
+            auto_ptr_XMLCh alg(alg_param);
+            if (alg.get()) {
                 sig->setSignatureAlgorithm(alg.get());
             }
-            if (dig_param) {
-               auto_ptr_XMLCh dig(dig_param);
+            auto_ptr_XMLCh dig(dig_param);
+            if (dig.get()) {
                dynamic_cast<opensaml::ContentReference*>(sig->getContentReference())->setDigestAlgorithm(dig.get());
             }
-            signable->setSignature(sig);
 
             // Sign response while re-marshalling.
             vector<Signature*> sigs(1,sig);