From 7054e2da22a83e5a6488470f9317862678e20de8 Mon Sep 17 00:00:00 2001
From: bit4bit <bit4bit@noemail.net>
Date: Tue, 21 Dec 2021 02:01:15 +0000
Subject: [PATCH] facho-signer: correciones para primera compilacion de wasm

FossilOrigin-Name: 7e2792a899cccff417c583b419ff7081d9630e405f39dc67aa96ed479b4b5164
---
 experimental/facho-signer/boostrap.sh         |  4 ++--
 experimental/facho-signer/configure.ac        | 23 +++++++++++--------
 experimental/facho-signer/src/Makefile.am     |  2 +-
 experimental/facho-signer/src/xades/xades.c   |  4 +++-
 experimental/facho-signer/src/xades/xades.h   |  5 +++-
 .../facho-signer/src/xades/xmlsec1/errors.c   |  1 +
 .../facho-signer/src/xades/xmlsec1/xmltree.c  |  2 ++
 7 files changed, 26 insertions(+), 15 deletions(-)

diff --git a/experimental/facho-signer/boostrap.sh b/experimental/facho-signer/boostrap.sh
index c69ea37..be5ca29 100644
--- a/experimental/facho-signer/boostrap.sh
+++ b/experimental/facho-signer/boostrap.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
-libtoolize -c
-autoreconf --install
+libtoolize -c --force
+autoreconf --install --force
diff --git a/experimental/facho-signer/configure.ac b/experimental/facho-signer/configure.ac
index a299e73..da9e2b6 100644
--- a/experimental/facho-signer/configure.ac
+++ b/experimental/facho-signer/configure.ac
@@ -13,16 +13,10 @@ AC_PROG_CC
 
 # Checks for libraries.
 PKG_CHECK_MODULES([OPENSSL], [openssl])
-PKG_CHECK_MODULES([XMLSEC1], [xmlsec1-openssl])
+PKG_CHECK_MODULES([XMLSEC1], [xmlsec1-openssl], [
+                             AC_DEFINE([XMLSEC_CRYPTO_OPENSSL], [1], [enable crypto openssl])
+                             ])
 PKG_CHECK_MODULES([LZMA], [liblzma])
-AC_CHECK_HEADER([ltdl.h], [
-		AC_CHECK_LIB(
-			[ltdl],
-			[lt_dlopenext],
-			[LIBLTDL=-lltdl],
-			[LIBLTDL=]
-			)
-		], [ LIBLTDL= ])
 
 AC_ARG_ENABLE([xmlsec-crypto-dynamic-loading],
         AS_HELP_STRING([--enable-xmlsec-crypto-dynamic-loading],
@@ -31,6 +25,15 @@ AC_ARG_ENABLE([xmlsec-crypto-dynamic-loading],
 
 if test "x$enable_xmlsec_crypto_dynamic_loading" == xyes; then
   AC_DEFINE([XMLSEC_CRYPTO_DYNAMIC_LOADING], [1], [enable xmlsec crypto dynamic loading])
+  AC_CHECK_HEADER([ltdl.h], [
+		AC_CHECK_LIB(
+			[ltdl],
+			[lt_dlopenext],
+			[LIBLTDL=-lltdl],
+			[LIBLTDL=]
+			)
+		], [ LIBLTDL= ])
+
 else
   AC_DEFINE([XMLSEC_NO_CRYPTO_DYNAMIC_LOADING], [1], [disable xmlsec crypto dynamic loading])
 fi
@@ -47,7 +50,7 @@ AC_CHECK_FUNCS([clock_gettime gethrtime gettimeofday memset strdup])
 
 # libtool
 
-LT_INIT([dlopen])
+LT_INIT
 
 AC_CONFIG_FILES([Makefile src/Makefile])
 AC_OUTPUT
diff --git a/experimental/facho-signer/src/Makefile.am b/experimental/facho-signer/src/Makefile.am
index f74b620..eedcaf4 100644
--- a/experimental/facho-signer/src/Makefile.am
+++ b/experimental/facho-signer/src/Makefile.am
@@ -1,7 +1,7 @@
 SOURCES = xades/xmlsec1/xmltree.c xades/xmlsec1/errors.c xades/templates.c xades/xades.c facho_signer.c
 
 lib_LTLIBRARIES = libfachosigner.la
-libfachosigner_la_SOURCES = $(SOURCES)
+libfachosigner_la_SOURCES = $(LTDL_SOURCE_FILES) $(SOURCES)
 libfachosigner_la_CFLAGS = $(OPENSSL_CFLAGS) $(XMLSEC1_CFLAGS) -DXMLSEC_NOT_CRYPTO_DYNAMIC_LOADING
 libfachosigner_la_LDFLAGS = $(OPENSSL_LIBS) $(LIBLTDL) $(XMLSEC1_LIBS)
 
diff --git a/experimental/facho-signer/src/xades/xades.c b/experimental/facho-signer/src/xades/xades.c
index 8492a9f..2a15b08 100644
--- a/experimental/facho-signer/src/xades/xades.c
+++ b/experimental/facho-signer/src/xades/xades.c
@@ -1,4 +1,5 @@
 #include "config.h"
+
 #include "xades.h"
 
 #include <libxml/xpath.h>
@@ -14,7 +15,8 @@
 #include <xmlsec/transforms.h>
 #include <xmlsec/keysdata.h>
 
-#ifndef XMLSEC_CRYPTO_DYNAMIC_LOADING
+#ifdef XMLSEC_NO_CRYPTO_DYNAMIC_LOADING
+#include <xmlsec/openssl/x509.h>
 #include <xmlsec/openssl/crypto.h>
 #include <xmlsec/openssl/symbols.h>
 #endif
diff --git a/experimental/facho-signer/src/xades/xades.h b/experimental/facho-signer/src/xades/xades.h
index 6dd361f..fcb9dc5 100644
--- a/experimental/facho-signer/src/xades/xades.h
+++ b/experimental/facho-signer/src/xades/xades.h
@@ -1,12 +1,15 @@
 #ifndef XADES_H
 #define XADES_H
 
+
+
 #include <libxml/tree.h>
 
+#define XMLSEC_NO_XSLT 1
+
 #include <xmlsec/xmltree.h>
 #include <xmlsec/transforms.h>
 #include <xmlsec/xmldsig.h>
-#include <xmlsec/openssl/x509.h>
 #include <xmlsec/base64.h>
 
 #include "xmlsec1/errors_helpers.h"
diff --git a/experimental/facho-signer/src/xades/xmlsec1/errors.c b/experimental/facho-signer/src/xades/xmlsec1/errors.c
index 46d487e..55c6a26 100644
--- a/experimental/facho-signer/src/xades/xmlsec1/errors.c
+++ b/experimental/facho-signer/src/xades/xmlsec1/errors.c
@@ -15,6 +15,7 @@
  */
 
 #define XMLSEC_PRIVATE 1
+#define XMLSEC_NO_XSLT 1
 
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/experimental/facho-signer/src/xades/xmlsec1/xmltree.c b/experimental/facho-signer/src/xades/xmlsec1/xmltree.c
index 3056bb5..17d229c 100644
--- a/experimental/facho-signer/src/xades/xmlsec1/xmltree.c
+++ b/experimental/facho-signer/src/xades/xmlsec1/xmltree.c
@@ -23,6 +23,8 @@
 #include <libxml/xpath.h>
 #include <libxml/xpathInternals.h>
 
+#define XMLSEC_NO_XSLT 1
+
 #include <xmlsec/xmlsec.h>
 #include <xmlsec/xmltree.h>
 #include <xmlsec/parser.h>