bugfix, correct previous change on locating xmlsec1
authorThierry Parmentelat <thierry.parmentelat@inria.fr>
Thu, 10 Dec 2015 10:47:53 +0000 (11:47 +0100)
committerThierry Parmentelat <thierry.parmentelat@inria.fr>
Thu, 10 Dec 2015 10:47:53 +0000 (11:47 +0100)
sfa/trust/credential.py
sfa/trust/speaksfor_util.py

index 4c56318..3f658fb 100644 (file)
@@ -893,7 +893,7 @@ class Credential(object):
             #cert_args = " ".join(['--trusted-pem %s' % x for x in trusted_certs])
             #command = '{} --verify --node-id "{}" {} {} 2>&1'.\
             #          format(self.xmlsec_path, ref, cert_args, filename)
-            xmlsec1 = cred.get_xmlsec1_path()
+            xmlsec1 = self.get_xmlsec1_path()
             if not xmlsec1:
                 raise Exception("Could not locate required 'xmlsec1' program")
             command = [ xmlsec1, '--verify', '--node-id', ref ]
index af2f8b5..9e85924 100644 (file)
@@ -368,7 +368,7 @@ def create_speaks_for(tool_gid, user_gid, ma_gid, \
     # --output signed.xml tosign.xml
     pems = "%s,%s,%s" % (user_key_file, user_gid.get_filename(),
                          ma_gid.get_filename())
-    xmlsec1 = cred.get_xmlsec1_path()
+    xmlsec1 = Credential.get_xmlsec1_path()
     if not xmlsec1:
         raise Exception("Could not locate required 'xmlsec1' program")
     cmd = [ xmlsec1,  '--sign',  '--privkey-pem', pems,