facho-signer: correciones para primera compilacion de wasm

FossilOrigin-Name: 7e2792a899cccff417c583b419ff7081d9630e405f39dc67aa96ed479b4b5164
This commit is contained in:
bit4bit 2021-12-21 02:01:15 +00:00
parent dc9e0d9ad7
commit 7054e2da22
7 changed files with 26 additions and 15 deletions

View File

@ -1,3 +1,3 @@
#!/bin/sh #!/bin/sh
libtoolize -c libtoolize -c --force
autoreconf --install autoreconf --install --force

View File

@ -13,16 +13,10 @@ AC_PROG_CC
# Checks for libraries. # Checks for libraries.
PKG_CHECK_MODULES([OPENSSL], [openssl]) 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]) 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], AC_ARG_ENABLE([xmlsec-crypto-dynamic-loading],
AS_HELP_STRING([--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 if test "x$enable_xmlsec_crypto_dynamic_loading" == xyes; then
AC_DEFINE([XMLSEC_CRYPTO_DYNAMIC_LOADING], [1], [enable xmlsec crypto dynamic loading]) 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 else
AC_DEFINE([XMLSEC_NO_CRYPTO_DYNAMIC_LOADING], [1], [disable xmlsec crypto dynamic loading]) AC_DEFINE([XMLSEC_NO_CRYPTO_DYNAMIC_LOADING], [1], [disable xmlsec crypto dynamic loading])
fi fi
@ -47,7 +50,7 @@ AC_CHECK_FUNCS([clock_gettime gethrtime gettimeofday memset strdup])
# libtool # libtool
LT_INIT([dlopen]) LT_INIT
AC_CONFIG_FILES([Makefile src/Makefile]) AC_CONFIG_FILES([Makefile src/Makefile])
AC_OUTPUT AC_OUTPUT

View File

@ -1,7 +1,7 @@
SOURCES = xades/xmlsec1/xmltree.c xades/xmlsec1/errors.c xades/templates.c xades/xades.c facho_signer.c SOURCES = xades/xmlsec1/xmltree.c xades/xmlsec1/errors.c xades/templates.c xades/xades.c facho_signer.c
lib_LTLIBRARIES = libfachosigner.la 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_CFLAGS = $(OPENSSL_CFLAGS) $(XMLSEC1_CFLAGS) -DXMLSEC_NOT_CRYPTO_DYNAMIC_LOADING
libfachosigner_la_LDFLAGS = $(OPENSSL_LIBS) $(LIBLTDL) $(XMLSEC1_LIBS) libfachosigner_la_LDFLAGS = $(OPENSSL_LIBS) $(LIBLTDL) $(XMLSEC1_LIBS)

View File

@ -1,4 +1,5 @@
#include "config.h" #include "config.h"
#include "xades.h" #include "xades.h"
#include <libxml/xpath.h> #include <libxml/xpath.h>
@ -14,7 +15,8 @@
#include <xmlsec/transforms.h> #include <xmlsec/transforms.h>
#include <xmlsec/keysdata.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/crypto.h>
#include <xmlsec/openssl/symbols.h> #include <xmlsec/openssl/symbols.h>
#endif #endif

View File

@ -1,12 +1,15 @@
#ifndef XADES_H #ifndef XADES_H
#define XADES_H #define XADES_H
#include <libxml/tree.h> #include <libxml/tree.h>
#define XMLSEC_NO_XSLT 1
#include <xmlsec/xmltree.h> #include <xmlsec/xmltree.h>
#include <xmlsec/transforms.h> #include <xmlsec/transforms.h>
#include <xmlsec/xmldsig.h> #include <xmlsec/xmldsig.h>
#include <xmlsec/openssl/x509.h>
#include <xmlsec/base64.h> #include <xmlsec/base64.h>
#include "xmlsec1/errors_helpers.h" #include "xmlsec1/errors_helpers.h"

View File

@ -15,6 +15,7 @@
*/ */
#define XMLSEC_PRIVATE 1 #define XMLSEC_PRIVATE 1
#define XMLSEC_NO_XSLT 1
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>

View File

@ -23,6 +23,8 @@
#include <libxml/xpath.h> #include <libxml/xpath.h>
#include <libxml/xpathInternals.h> #include <libxml/xpathInternals.h>
#define XMLSEC_NO_XSLT 1
#include <xmlsec/xmlsec.h> #include <xmlsec/xmlsec.h>
#include <xmlsec/xmltree.h> #include <xmlsec/xmltree.h>
#include <xmlsec/parser.h> #include <xmlsec/parser.h>