Skip to content

Commit

Permalink
released 1.0.2
Browse files Browse the repository at this point in the history
  • Loading branch information
frankmorgner committed Jul 20, 2017
1 parent dd7ad17 commit c4bffe2
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 12 deletions.
10 changes: 5 additions & 5 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -86,21 +86,21 @@ build_script:
|| cat config.log)
&& make || true"
# The import library is not created by libtool. We need to do it by hand!
- bash -c "cat cross/libeac-1_without_patched_openssl.def | sed 's, DATA,,' > libeac-1.def"
- lib /machine:%VCVARS_PLATFORM% /def:libeac-1.def /out:src\.libs\libeac.lib
- bash -c "cat cross/libeac-2_without_patched_openssl.def | sed 's, DATA,,' > libeac-2.def"
- lib /machine:%VCVARS_PLATFORM% /def:libeac-2.def /out:src\.libs\libeac.lib
# now link and install the binaries
- bash -c "make install"
# The import library is overwritten with libeac-1.dll by libtool during
# The import library is overwritten with libeac-2.dll by libtool during
# `make install`. We need to create it by hand, againg!
- lib /machine:%VCVARS_PLATFORM% /def:libeac-1.def /out:%OPENPACE_DIR%\lib\libeac.lib
- lib /machine:%VCVARS_PLATFORM% /def:libeac-2.def /out:%OPENPACE_DIR%\lib\libeac.lib
# Copy OpenSSL stuff into binary distribution
- bash -c "cp $OPENSSL_CYGDIR/bin/openssl.exe $DESTDIR/bin"
- bash -c "cp $OPENSSL_CYGDIR/bin/libeay32.dll $DESTDIR/bin"
- bash -c "cp $OPENSSL_CYGDIR/bin/ssleay32.dll $DESTDIR/bin"
- bash -c "cp $OPENSSL_CYGDIR/lib/libeay32.lib $DESTDIR/lib"
- bash -c "cp $OPENSSL_CYGDIR/lib/ssleay32.lib $DESTDIR/lib"
- bash -c "cp -r $OPENSSL_CYGDIR/include/openssl $DESTDIR/include"
- bash -c "mv $DESTDIR/lib/libeac-1.dll $DESTDIR/bin"
- bash -c "mv $DESTDIR/lib/libeac-2.dll $DESTDIR/bin"
#- bash -c "$DESTDIR/bin/eactest"

# build with plain cl in cmd and statically bound OpenSSL
Expand Down
8 changes: 4 additions & 4 deletions bindings/win32/eac.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ echo Please ensure the following cross compiled files are available:
echo $(OPENPACE_ROOT)\lib\libeac.lib
echo $(OPENPACE_ROOT)\lib\libeay32.lib
echo If you are using the cross compiled binaries, you may create the libs using the following commands:
echo lib /def:$(OPENPACE_ROOT)\lib\libeac-1.def /OUT:$(OPENPACE_ROOT)\lib\libeac.lib
echo lib /def:$(OPENPACE_ROOT)\lib\libeac-2.def /OUT:$(OPENPACE_ROOT)\lib\libeac.lib
echo lib /def:$(OPENPACE_ROOT)\lib\libeay32.def /OUT:$(OPENPACE_ROOT)\lib\libeay32.lib
</Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\%(Filename)_wrap.c;$(Outdir)%(Filename).py;$(OPENPACE_ROOT)\lib\libeac.lib;$(OPENPACE_ROOT)\lib\libeay32.lib;</Outputs>
Expand All @@ -40,7 +40,7 @@ echo Please ensure the following cross compiled files are available:
echo $(OPENPACE_ROOT)\lib\libeac.lib
echo $(OPENPACE_ROOT)\lib\libeay32.lib
echo If you are using the cross compiled binaries, you may create the libs using the following commands:
echo lib /def:$(OPENPACE_ROOT)\lib\libeac-1.def /OUT:$(OPENPACE_ROOT)\lib\libeac.lib
echo lib /def:$(OPENPACE_ROOT)\lib\libeac-2.def /OUT:$(OPENPACE_ROOT)\lib\libeac.lib
echo lib /def:$(OPENPACE_ROOT)\lib\libeay32.def /OUT:$(OPENPACE_ROOT)\lib\libeay32.lib
</Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\%(Filename)_wrap.c;$(Outdir)%(Filename).py;$(OPENPACE_ROOT)\lib\libeac.lib;$(OPENPACE_ROOT)\lib\libeay32.lib</Outputs>
Expand Down Expand Up @@ -106,7 +106,7 @@ echo lib /def:$(OPENPACE_ROOT)\lib\libeay32.def /OUT:$(OPENPACE_ROOT)\lib\libeay
<SubSystem>Windows</SubSystem>
<AdditionalLibraryDirectories>$(PYTHON_LIBD);$(OPENPACE_ROOT)\lib</AdditionalLibraryDirectories>
<AdditionalDependencies>$(PYTHON_LIB);libeac.lib;libeay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<DelayLoadDLLs>libeac-1.dll;libeay32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
<DelayLoadDLLs>libeac-2.dll;libeay32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
Expand All @@ -123,7 +123,7 @@ echo lib /def:$(OPENPACE_ROOT)\lib\libeay32.def /OUT:$(OPENPACE_ROOT)\lib\libeay
<OptimizeReferences>true</OptimizeReferences>
<AdditionalLibraryDirectories>$(PYTHON_LIBD);$(OPENPACE_ROOT)\lib</AdditionalLibraryDirectories>
<AdditionalDependencies>$(PYTHON_LIB);libeac.lib;libeay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<DelayLoadDLLs>libeac-1.dll;libeay32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
<DelayLoadDLLs>libeac-2.dll;libeay32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
</Link>
</ItemDefinitionGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
Expand Down
2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Process this file with autoconf to produce a configure script.

AC_PREREQ([2.67])
AC_INIT([OpenPACE], [1.0.1], [https://github.com/frankmorgner/openpace/issues], [openpace], [http://frankmorgner.github.io/openpace/])
AC_INIT([OpenPACE], [1.0.2], [https://github.com/frankmorgner/openpace/issues], [openpace], [http://frankmorgner.github.io/openpace/])
AC_CONFIG_SRCDIR([src/eactest.c])
AC_CONFIG_HEADERS([config.h])
AC_CONFIG_MACRO_DIR([m4])
Expand Down
2 changes: 1 addition & 1 deletion cross/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ win:
TARGETDIR=$(WIN_TARGETDIR) \
ENABLE_PYTHON="" \
LDFLAGS="-static-libgcc" \
LIBEAC=$(WIN_TARGETDIR)/bin/libeac-1.dll
LIBEAC=$(WIN_TARGETDIR)/bin/libeac-2.dll
cd $(WIN_TARGETDIR)/lib && gendef $(WIN_TARGETDIR)/bin/*.dll


Expand Down
2 changes: 1 addition & 1 deletion src/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ noinst_LTLIBRARIES = libvc.la

libeac_la_SOURCES = ca_lib.c cv_cert.c cvc_lookup.c x509_lookup.c eac_asn1.c eac.c eac_ca.c eac_dh.c eac_ecdh.c eac_kdf.c eac_lib.c eac_print.c eac_util.c misc.c pace.c pace_lib.c pace_mappings.c ri.c ri_lib.c ta.c ta_lib.c objects.c ssl_compat.c
libeac_la_CPPFLAGS = $(CRYPTO_CFLAGS) -DCVCDIR=\"@CVCDIR@\" -DX509DIR=\"@X509DIR@\"
libeac_la_LDFLAGS = -no-undefined -version-info 1:0:0
libeac_la_LDFLAGS = -no-undefined -version-info 2:0:0
libeac_la_LIBADD = $(CRYPTO_LIBS)
if WIN32
AM_CPPFLAGS = -DWIN32_LEAN_AND_MEAN
Expand Down

0 comments on commit c4bffe2

Please sign in to comment.