From bc74cdd9f06fbb19fd0c14ca384f982b64c709f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josef=20Fr=C3=B6hle?= <froehle@b1-systems.de>
Date: Thu, 13 Dec 2018 19:33:04 +0100
Subject: [PATCH] c

---
 Dockerfile.build        |  4 +++-
 Dockerfile.build-static | 16 +++++++++-------
 Makefile                |  2 +-
 xmlsec.go               |  4 ++--
 4 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/Dockerfile.build b/Dockerfile.build
index d8a80b8..7997016 100644
--- a/Dockerfile.build
+++ b/Dockerfile.build
@@ -4,13 +4,15 @@ RUN apt-get update -yy && \
 
 RUN curl -s https://storage.googleapis.com/golang/go1.11.2.linux-amd64.tar.gz | tar -C /usr/local -xzf -
 ENV GOPATH=/go
+ENV CGO_LDFLAGS_ALLOW=".*"
+ENV CGO_CFLAGS_ALLOW=".*"
 ENV PATH=$PATH:/usr/local/go/bin:/go/bin
 RUN mkdir -p /go/bin
 
 ADD . /go/src/git.deineagentur.com/DeineAgenturUG/go-xmlsec
 WORKDIR /go/src/git.deineagentur.com/DeineAgenturUG/go-xmlsec
 RUN go get github.com/crewjam/errset
-RUN go build -o /bin/xmldsig ./examples/xmldsig.go
+RUN go build -v -o /bin/xmldsig ./examples/xmldsig.go
 
 # Check our dynamic library dependencies. This will produce output like:
 #
diff --git a/Dockerfile.build-static b/Dockerfile.build-static
index beaea0f..2ddf729 100644
--- a/Dockerfile.build-static
+++ b/Dockerfile.build-static
@@ -4,11 +4,13 @@ RUN apt-get update -yy && \
 
 RUN curl -s https://storage.googleapis.com/golang/go1.11.2.linux-amd64.tar.gz | tar -C /usr/local -xzf -
 ENV GOPATH=/go
+ENV CGO_LDFLAGS_ALLOW=".*"
+ENV CGO_CFLAGS_ALLOW=".*"
 ENV PATH=$PATH:/usr/local/go/bin:/go/bin
 RUN mkdir -p /go/bin
 
-RUN curl -sL ftp://xmlsoft.org/libxml2/libxml2-2.9.4.tar.gz | tar -xzf - && \
-  cd /libxml2-2.9.4 && \
+RUN curl -sL ftp://xmlsoft.org/libxml2/libxml2-2.9.8.tar.gz | tar -xzf - && \
+  cd /libxml2-2.9.8 && \
   ./configure \
     --enable-static \
     --disable-shared \
@@ -53,8 +55,8 @@ RUN curl -sL ftp://xmlsoft.org/libxml2/libxml2-2.9.4.tar.gz | tar -xzf - && \
     --without-coverage && \
     make install
 
-RUN curl -sL ftp://ftp.openssl.org/source/openssl-1.0.2j.tar.gz | tar -xzf - && \
-  cd openssl-1.0.2j && \
+RUN curl -sL ftp://ftp.openssl.org/source/openssl-1.0.2q.tar.gz | tar -xzf - && \
+  cd openssl-1.0.2q && \
   ./config \
     no-shared \
     no-weak-ssl-ciphers \
@@ -68,8 +70,8 @@ RUN curl -sL ftp://ftp.openssl.org/source/openssl-1.0.2j.tar.gz | tar -xzf - &&
     no-dso && \
   make depend install
 
-RUN curl -sL http://www.aleksey.com/xmlsec/download/xmlsec1-1.2.22.tar.gz | tar -xzf - && \
- cd xmlsec1-1.2.22 && \
+RUN curl -sL http://www.aleksey.com/xmlsec/download/xmlsec1-1.2.27.tar.gz | tar -xzf - && \
+ cd xmlsec1-1.2.27 && \
  ./configure \
   --enable-static \
   --disable-shared \
@@ -92,6 +94,6 @@ RUN curl -sL http://www.aleksey.com/xmlsec/download/xmlsec1-1.2.22.tar.gz | tar
 ADD . /go/src/git.deineagentur.com/DeineAgenturUG/go-xmlsec
 WORKDIR /go/src/git.deineagentur.com/DeineAgenturUG/go-xmlsec
 RUN go get github.com/crewjam/errset
-RUN go build -tags static -ldflags '-s -extldflags "-static"' -o /bin/xmldsig ./examples/xmldsig.go
+RUN go build -v -tags static -ldflags '-s -w -extldflags "-static" -v' -o /bin/xmldsig ./examples/xmldsig.go
 RUN ldd /bin/xmldsig || true
 RUN /bin/xmldsig --help || true
diff --git a/Makefile b/Makefile
index 7074fbe..b3b09e4 100644
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,7 @@ SHELL=/bin/bash
 CVSPATH=git.deineagentur.com/DeineAgenturUG/go-xmlsec
 
 # Project vendor
-VENDOR=miracl
+VENDOR=DeineAgenturUG
 
 # Project name
 PROJECT=go-xmlsec
diff --git a/xmlsec.go b/xmlsec.go
index 1ace845..0a5c2a9 100644
--- a/xmlsec.go
+++ b/xmlsec.go
@@ -6,8 +6,8 @@ import "unsafe"
 //   brew install libxmlsec1 libxml2
 //   brew link libxml2 --force
 
-// #cgo CFLAGS: -DXMLSEC_CRYPTO_OPENSSL -UXMLSEC_CRYPTO_DYNAMIC_LOADING
-// #cgo LDFLAGS: -lxmlsec1-openssl
+// #cgo CFLAGS: -DXMLSEC_CRYPTO_OPENSSL=1 -UXMLSEC_CRYPTO_DYNAMIC_LOADING
+// #cgo LDFLAGS: -lxmlsec1-openssl -lxmlsec1 -lssl -lcrypto
 // #include <xmlsec/xmlsec.h>
 // #include <xmlsec/xmltree.h>
 // #include <xmlsec/xmlenc.h>