Changeset 1973

Timestamp:

09/01/07 09:40:54 (14 years ago)

Author:

pjkersha

Message:

Working version of enveloped signature (XMLSec.XMLSecDoc class) validated against XMLSec 'C' library.

python/Tests/xmlsec/Makefile: updates following re-install of XMLSec, libxml2 and libxslt in /usr/local to allow
build of sign3 and verify3 XMLSec example code. verify3 was used to verify enveloped signature generated by
XMLSec.XMLSecDoc.applyEnvelopedSignature.

python/ndg.security.common/ndg/security/common/XMLSec.py: corrected missing namespace qualifier 'ec' for
InclusiveNamespaces? element in the transforms for the reference.

python/ndg.security.common/ndg/security/common/wsSecurity.py: cosmetic correction to formatting.

Location:

TI12-security/trunk/python

Files:

• Tests/xmlsec/Makefile (modified) (1 diff)
• ndg.security.common/ndg/security/common/XMLSec.py (modified) (1 diff)
• ndg.security.common/ndg/security/common/wsSecurity.py (modified) (1 diff)

TI12-security/trunk/python/Tests/xmlsec/Makefile

@@ -1 @@
-PROGRAM = encrypt4
+PROGRAM = verify3
 PROGRAM_FILES = $(PROGRAM).c
 VALGRIND_FLAGS=-O0 -O1
 
-PKG_CONFIG_PATH=/usr/local/NDG/lib/pkgconfig
+#PKG_CONFIG_PATH=/usr/local/lib/pkgconfig/
 
 CFLAGS  += -g $(VALGRIND_FLAGS) \
-$(shell pkg-config \
---define-variable=prefix=/usr/local/NDG \
---define-variable=libdir=/usr/local/NDG/lib --cflags xmlsec1)
-LDFLAGS += #-L/usr/local/NDG/lib 
-LIBS    += $(shell pkg-config \
---define-variable=prefix=/usr/local/NDG \
---define-variable=libdir=/usr/local/NDG/lib --libs xmlsec1)
+$(shell pkg-config --cflags xmlsec1)
+LIBS   += $(shell pkg-config --libs xmlsec1)
+
+#CFLAGS += -g $(VALGRIND_FLAGS) \
+#$(shell pkg-config \
+#--define-variable=prefix=/usr/local \
+#--define-variable=libdir=/usr/local/lib --cflags xmlsec1)
+#LDFLAGS        += #-L/usr/local/lib 
+#LIBS   += $(shell pkg-config \
+#--define-variable=prefix=/usr/local \
+#--define-variable=libdir=/usr/local/lib --libs xmlsec1)
 
 all: $(PROGRAM)

TI12-security/trunk/python/ndg.security.common/ndg/security/common/XMLSec.py

@@ -459 +459 @@
         
         inclNamespacesNode = self.__docNode.createElementNS(\
-                                                       DSIG.C14N_EXCL,
-                                                       'InclusiveNamespaces')
+                                                   DSIG.C14N_EXCL,
+                                                   'ec:InclusiveNamespaces')
         inclNamespacesNode.setAttribute('PrefixList',
                                 ' '.join(refC14nKw['unsuppressedPrefixes']))

TI12-security/trunk/python/ndg.security.common/ndg/security/common/wsSecurity.py

@@ -143 +143 @@
         c14nMethodElem.node.setAttribute('Algorithm', DSIG.C14N_EXCL)
         c14nInclNamespacesElem = c14nMethodElem.createAppendElement(\
-                                                DSIG.C14N_EXCL,
-                                                'InclusiveNamespaces')
+                                                    DSIG.C14N_EXCL,
+                                                    'InclusiveNamespaces')
         c14nInclNamespacesElem.node.setAttribute('PrefixList', 
                         ' '.join(signedInfoC14nKw['unsuppressedPrefixes']))