Splited lasso_node_verify_signature() (LassoNode class) in 2 methods:

	lasso_node_verify_signature(),
	lasso_node_verify_x509_signature()

Added 2 private methods in LassoNode:
	add_signature_tmpl(),
	sign_signature_tmpl(),

Removed 'err' param in all methods for signing

1 files changed, 124 insertions, 110 deletions

diff --git a/lasso/xml/xml.h b/lasso/xml/xml.h
index 87abf759..7df0cc4e 100644
--- a/lasso/xml/xml.h
+++ b/lasso/xml/xml.h
@@ -47,6 +47,12 @@ typedef enum {
   lassoNodeExportTypeSoap
 } lassoNodeExportType;
 
+typedef enum {
+  lassoSignatureTypeNone = 0,
+  lassoSignatureTypeSimple,
+  lassoSignatureTypeWithX509
+} lassoSignatureType;
+
 typedef struct _xmlAttr LassoAttr;
 
 typedef struct _LassoNode LassoNode;
@@ -68,139 +74,147 @@ struct _LassoNodeClass {
   GObjectClass parent_class;
   /*< vtable >*/
   /*< public >*/
-  LassoNode*     (* copy)             (LassoNode     *node);
-  void           (* destroy)          (LassoNode     *node);
-  gchar*         (* dump)             (LassoNode     *node,
-				       const xmlChar *encoding,
-				       int            format);
-  gchar*         (* export)           (LassoNode     *node);
-  gchar*         (* export_to_base64) (LassoNode     *node);
-  gchar*         (* export_to_query)  (LassoNode     *node,
-				       lassoSignatureMethod  sign_method,
-				       const gchar          *private_key_file);
-  gchar*         (* export_to_soap)   (LassoNode     *node);
-  LassoAttr*     (* get_attr)         (LassoNode      *node,
-				       const xmlChar  *name,
-				       GError        **err);
-  xmlChar*       (* get_attr_value)   (LassoNode      *node,
-				       const xmlChar  *name,
-				       GError        **err);
-  GPtrArray*     (* get_attrs)        (LassoNode     *node);
-  LassoNode*     (* get_child)        (LassoNode      *node,
-				       const xmlChar  *name,
-				       const xmlChar  *href,
-				       GError        **err);
-  xmlChar*       (* get_child_content)(LassoNode      *node,
-				       const xmlChar  *name,
-				       const xmlChar  *href,
-				       GError        **err);
-  GPtrArray*     (* get_children)     (LassoNode     *node);
-  xmlChar*       (* get_content)      (LassoNode      *node,
-				       GError        **err);
-  xmlChar*       (* get_name)         (LassoNode     *node);
-  void           (* import)           (LassoNode     *node,
-                                       const gchar   *buffer);
-  void           (* import_from_node) (LassoNode     *node,
-                                       LassoNode     *imported_node);
-  void           (* rename_prop)      (LassoNode     *node,
-				       const xmlChar *old_name,
-				       const xmlChar *new_name);
-  gint           (* verify_signature) (LassoNode     *node,
-				       const gchar   *certificate_file,
-				       GError       **err);
+  LassoNode*     (* copy)                  (LassoNode     *node);
+  void           (* destroy)               (LassoNode     *node);
+  gchar*         (* dump)                  (LassoNode     *node,
+					    const xmlChar *encoding,
+					    int            format);
+  gchar*         (* export)                (LassoNode     *node);
+  gchar*         (* export_to_base64)      (LassoNode     *node);
+  gchar*         (* export_to_query)       (LassoNode     *node,
+					    lassoSignatureMethod  sign_method,
+					    const gchar          *private_key_file);
+  gchar*         (* export_to_soap)        (LassoNode     *node);
+  LassoAttr*     (* get_attr)              (LassoNode      *node,
+					    const xmlChar  *name,
+					    GError        **err);
+  xmlChar*       (* get_attr_value)        (LassoNode      *node,
+					    const xmlChar  *name,
+					    GError        **err);
+  GPtrArray*     (* get_attrs)             (LassoNode     *node);
+  LassoNode*     (* get_child)             (LassoNode      *node,
+					    const xmlChar  *name,
+					    const xmlChar  *href,
+					    GError        **err);
+  xmlChar*       (* get_child_content)     (LassoNode      *node,
+					    const xmlChar  *name,
+					    const xmlChar  *href,
+					    GError        **err);
+  GPtrArray*     (* get_children)          (LassoNode     *node);
+  xmlChar*       (* get_content)           (LassoNode      *node,
+					    GError        **err);
+  xmlChar*       (* get_name)              (LassoNode     *node);
+  void           (* import)                (LassoNode     *node,
+					    const gchar   *buffer);
+  void           (* import_from_node)      (LassoNode     *node,
+					    LassoNode     *imported_node);
+  void           (* rename_prop)           (LassoNode     *node,
+					    const xmlChar *old_name,
+					    const xmlChar *new_name);
+  gint           (* verify_signature)      (LassoNode   *node,
+					    const gchar *public_key_file);
+  gint           (* verify_x509_signature) (LassoNode   *node,
+					    const gchar *certificate_file);
   /*< private >*/
-  void       (* add_child)     (LassoNode     *node,
-				LassoNode     *child,
-				gboolean       unbounded);
-  gint       (* add_signature) (LassoNode      *node,
-				gint            sign_method,
-				const xmlChar  *private_key_file,
-				const xmlChar  *certificate_file,
-				GError        **err);
-  gchar*     (* build_query)   (LassoNode     *node);
-  xmlNodePtr (* get_xmlNode)   (LassoNode     *node);
-  void       (* new_child)     (LassoNode     *node,
-				const xmlChar *name,
-				const xmlChar *content,
-				gboolean       unbounded);
-  GData*     (* serialize)     (LassoNode     *node,
-				GData         *gd);
-  void       (* set_name)      (LassoNode     *node,
-				const xmlChar *name);
-  void       (* set_ns)        (LassoNode     *node,
-				const xmlChar *href,
-				const xmlChar *prefix);
-  void       (* set_prop)      (LassoNode     *node,
-				const xmlChar *name,
-				const xmlChar *value);
-  void       (* set_xmlNode)   (LassoNode     *node,
-				xmlNodePtr     libxml_node);
+  void       (* add_child)          (LassoNode     *node,
+				     LassoNode     *child,
+				     gboolean       unbounded);
+  gint       (* add_signature)      (LassoNode     *node,
+				     gint           sign_method,
+				     const xmlChar *private_key_file,
+				     const xmlChar *certificate_file);
+  gint       (* add_signature_tmpl) (LassoNode            *node,
+				     lassoSignatureType    sign_type,
+				     lassoSignatureMethod  sign_method);
+  gchar*     (* build_query)        (LassoNode     *node);
+  xmlNodePtr (* get_xmlNode)        (LassoNode     *node);
+  void       (* new_child)          (LassoNode     *node,
+				     const xmlChar *name,
+				     const xmlChar *content,
+				     gboolean       unbounded);
+  GData*     (* serialize)          (LassoNode     *node,
+				     GData         *gd);
+  void       (* set_name)           (LassoNode     *node,
+				     const xmlChar *name);
+  void       (* set_ns)             (LassoNode     *node,
+				     const xmlChar *href,
+				     const xmlChar *prefix);
+  void       (* set_prop)           (LassoNode     *node,
+				     const xmlChar *name,
+				     const xmlChar *value);
+  void       (* set_xmlNode)        (LassoNode     *node,
+				     xmlNodePtr     libxml_node);
+  gint       (* sign_signature_tmpl)(LassoNode     *node,
+				     const xmlChar *private_key_file,
+				     const xmlChar *certificate_file);
 };
 
-LASSO_EXPORT GType          lasso_node_get_type         (void);
+LASSO_EXPORT GType      lasso_node_get_type              (void);
+
+LASSO_EXPORT LassoNode* lasso_node_new                   (void);
+LASSO_EXPORT LassoNode* lasso_node_new_from_dump         (const gchar *buffer);
+LASSO_EXPORT LassoNode* lasso_node_new_from_xmlNode      (xmlNodePtr node);
 
-LASSO_EXPORT LassoNode* lasso_node_new              (void);
-LASSO_EXPORT LassoNode* lasso_node_new_from_dump    (const gchar *buffer);
-LASSO_EXPORT LassoNode* lasso_node_new_from_xmlNode (xmlNodePtr node);
+LASSO_EXPORT LassoNode* lasso_node_copy                  (LassoNode *node);
 
-LASSO_EXPORT LassoNode* lasso_node_copy             (LassoNode *node);
+LASSO_EXPORT void       lasso_node_destroy               (LassoNode *node);
 
-LASSO_EXPORT void       lasso_node_destroy          (LassoNode *node);
+LASSO_EXPORT gchar*     lasso_node_dump                  (LassoNode     *node,
+							  const xmlChar *encoding,
+							  int            format);
 
-LASSO_EXPORT gchar*     lasso_node_dump             (LassoNode     *node,
-						     const xmlChar *encoding,
-						     int            format);
+LASSO_EXPORT gchar*     lasso_node_export                (LassoNode *node);
 
-LASSO_EXPORT gchar*     lasso_node_export           (LassoNode *node);
+LASSO_EXPORT gchar*     lasso_node_export_to_base64      (LassoNode *node);
 
-LASSO_EXPORT gchar*     lasso_node_export_to_base64 (LassoNode *node);
+LASSO_EXPORT gchar*     lasso_node_export_to_query       (LassoNode            *node,
+							  lassoSignatureMethod  sign_method,
+							  const gchar          *private_key_file);
 
-LASSO_EXPORT gchar*     lasso_node_export_to_query  (LassoNode            *node,
-						     lassoSignatureMethod  sign_method,
-						     const gchar          *private_key_file);
+LASSO_EXPORT gchar*     lasso_node_export_to_soap        (LassoNode *node);
 
-LASSO_EXPORT gchar*     lasso_node_export_to_soap   (LassoNode *node);
+LASSO_EXPORT LassoAttr* lasso_node_get_attr              (LassoNode      *node,
+							  const xmlChar  *name,
+							  GError        **err);
 
-LASSO_EXPORT LassoAttr* lasso_node_get_attr         (LassoNode      *node,
-						     const xmlChar  *name,
-						     GError        **err);
+LASSO_EXPORT xmlChar*   lasso_node_get_attr_value        (LassoNode      *node,
+							  const xmlChar  *name,
+							  GError        **err);
 
-LASSO_EXPORT xmlChar*   lasso_node_get_attr_value   (LassoNode      *node,
-						     const xmlChar  *name,
-						     GError        **err);
+LASSO_EXPORT GPtrArray* lasso_node_get_attrs             (LassoNode *node);
 
-LASSO_EXPORT GPtrArray* lasso_node_get_attrs        (LassoNode *node);
+LASSO_EXPORT LassoNode* lasso_node_get_child             (LassoNode      *node,
+							  const xmlChar  *name,
+							  const xmlChar  *href,
+							  GError        **err);
 
-LASSO_EXPORT LassoNode* lasso_node_get_child        (LassoNode      *node,
-						     const xmlChar  *name,
-						     const xmlChar  *href,
-						     GError        **err);
+LASSO_EXPORT xmlChar *  lasso_node_get_child_content     (LassoNode      *node,
+							  const xmlChar  *name,
+							  const xmlChar  *href,
+							  GError        **err);
 
-LASSO_EXPORT xmlChar *  lasso_node_get_child_content(LassoNode      *node,
-						     const xmlChar  *name,
-						     const xmlChar  *href,
-						     GError        **err);
+LASSO_EXPORT GPtrArray* lasso_node_get_children          (LassoNode *node);
 
-LASSO_EXPORT GPtrArray* lasso_node_get_children     (LassoNode *node);
+LASSO_EXPORT xmlChar*   lasso_node_get_content           (LassoNode  *node,
+							  GError    **err);
 
-LASSO_EXPORT xmlChar*   lasso_node_get_content      (LassoNode  *node,
-						     GError    **err);
+LASSO_EXPORT xmlChar*   lasso_node_get_name              (LassoNode *node);
 
-LASSO_EXPORT xmlChar*   lasso_node_get_name         (LassoNode *node);
+LASSO_EXPORT void       lasso_node_import                (LassoNode   *node,
+							  const gchar *buffer);
 
-LASSO_EXPORT void       lasso_node_import           (LassoNode   *node,
-						     const gchar *buffer);
+LASSO_EXPORT void       lasso_node_import_from_node      (LassoNode *node,
+							  LassoNode *imported_node);
 
-LASSO_EXPORT void       lasso_node_import_from_node (LassoNode *node,
-						     LassoNode *imported_node);
+LASSO_EXPORT void       lasso_node_rename_prop           (LassoNode     *node,
+							  const xmlChar *old_name,
+							  const xmlChar *new_name);
 
-LASSO_EXPORT void       lasso_node_rename_prop      (LassoNode     *node,
-						     const xmlChar *old_name,
-						     const xmlChar *new_name);
+LASSO_EXPORT gint       lasso_node_verify_signature      (LassoNode   *node,
+							  const gchar *public_key_file);
 
-LASSO_EXPORT gint       lasso_node_verify_signature (LassoNode    *node,
-						     const gchar  *certificate_file,
-						     GError      **err);
+LASSO_EXPORT gint       lasso_node_verify_x509_signature (LassoNode   *node,
+							  const gchar *certificate_file);
 
 #ifdef __cplusplus
 }