diff --git a/.travis.yml b/.travis.yml index 7a248d60..2257335e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,10 +7,6 @@ env: global: - PARALLELMFLAGS="-j4" matrix: - - OPENSSL_UPSTREAM=old/0.9.x/openssl-0.9.8zh.tar.gz - OPENSSL_SHA1=3ff71636bea85a99f4d76a10d119c09bda0421e3 - OPENSSL_BUILD_PARALLEL=NO - - OPENSSL_UPSTREAM=old/1.0.2/openssl-1.0.2u.tar.gz OPENSSL_SHA1=740916d79ab0d209d2775277b1c6c3ec2f6502b2 diff --git a/INSTALL b/INSTALL index c2916435..0d3fe280 100644 --- a/INSTALL +++ b/INSTALL @@ -10,7 +10,7 @@ Requirements: for compilation, you need the following Libraries: QT >= 4.8.0 from http://www.troll.no -OpenSSL >= 0.9.8 from http://www.openssl.org +OpenSSL >= 1.0.2 from http://www.openssl.org GNU C++ compiler >= 3.1.0 GNU make diff --git a/configure.ac b/configure.ac index d84b9085..213d8708 100644 --- a/configure.ac +++ b/configure.ac @@ -111,7 +111,7 @@ if test -n "${_OPENSSLDIR}" && test -d "${_OPENSSLDIR}"; then fi PKG_CHECK_MODULES([OpenSSL], - [libcrypto >= 0.9.8], [ ], + [libcrypto >= 1.0.2], [ ], [ OpenSSL_LIBS=" -lcrypto "; AC_MSG_WARN([OpenSSL pkg-config failed, using fallback defaults (${OpenSSL_LIBS})]); diff --git a/misc/openssl-0.9.8-mingw32-cross.patch b/misc/openssl-0.9.8-mingw32-cross.patch deleted file mode 100644 index 7a9acf16..00000000 --- a/misc/openssl-0.9.8-mingw32-cross.patch +++ /dev/null @@ -1,195 +0,0 @@ -diff -Nur openssl-0.9.8e.orig/crypto/pqueue/pqueue.c openssl-0.9.8e/crypto/pqueue/pqueue.c ---- openssl-0.9.8e.orig/crypto/pqueue/pqueue.c 2005-06-28 14:53:33.000000000 +0200 -+++ openssl-0.9.8e/crypto/pqueue/pqueue.c 2007-04-05 10:31:26.000000000 +0200 -@@ -199,10 +199,10 @@ - return found; - } - --#if PQ_64BIT_IS_INTEGER - void - pqueue_print(pqueue_s *pq) - { -+#if PQ_64BIT_IS_INTEGER - pitem *item = pq->items; - - while(item != NULL) -@@ -210,8 +210,8 @@ - printf("item\t" PQ_64BIT_PRINT "\n", item->priority); - item = item->next; - } -- } - #endif -+ } - - pitem * - pqueue_iterator(pqueue_s *pq) -diff -Nur openssl-0.9.8e.orig/ms/mingw32-cross.sh openssl-0.9.8e/ms/mingw32-cross.sh ---- openssl-0.9.8e.orig/ms/mingw32-cross.sh 1970-01-01 01:00:00.000000000 +0100 -+++ openssl-0.9.8e/ms/mingw32-cross.sh 2009-11-05 10:07:58.000000000 +0100 -@@ -0,0 +1,45 @@ -+#!/bin/sh -+# Mingw32 on Linux + GNU as -+# --------------------------- -+ -+CROSS=i586-mingw32msvc- -+ -+sh Configure mingw $@ -+ -+if echo $@ | grep 'no-asm' >/dev/null 2>&1; then -+ echo No assembler will be used -+else -+ echo Generating x86 for GNU assember -+ for name in `find -name "*586.pl"` ./crypto/x86cpuid.pl; do -+ n=`basename $name` -+ t=`echo $n | sed 's/\.pl/-win32.s/'` -+ echo Creating $t from $n -+ (cd `dirname $name` && perl $n gaswin > $t ) -+ done -+fi -+ -+echo Generating makefile -+perl util/mkfiles.pl >MINFO -+perl util/mk1mf.pl gaswin $@ Mingw32-cross >ms/mingw32-cross.mak -+ -+echo Generating DLL definition files -+perl util/mkdef.pl 32 libeay >ms/libeay32.def -+perl util/mkdef.pl 32 ssleay >ms/ssleay32.def -+ -+echo Building the libraries -+make -f ms/mingw32-cross.mak CROSS=${CROSS} -+ -+echo Generating the DLLs and input libraries -+${CROSS}dllwrap --dllname libeay32.dll --output-lib out/libeay32.a --def ms/libeay32.def out/libcrypto.a -lwsock32 -lgdi32 -+ -+${CROSS}dllwrap --dllname libssl32.dll --output-lib out/libssl32.a --def ms/ssleay32.def out/libssl.a out/libeay32.a -+ -+if test -n "${INSTALL_DIR}"; then -+ mkdir -p ${INSTALL_DIR}/bin ${INSTALL_DIR}/lib ${INSTALL_DIR}/include -+ cp -r outinc/openssl ${INSTALL_DIR}/include -+ cp *.dll ${INSTALL_DIR}/bin -+ cp out/*.a ${INSTALL_DIR}/lib -+fi -+ -+echo Done compiling OpenSSL -+ -diff -Nur openssl-0.9.8e.orig/util/mk1mf.pl openssl-0.9.8e/util/mk1mf.pl ---- openssl-0.9.8e.orig/util/mk1mf.pl 2006-11-30 14:04:43.000000000 +0100 -+++ openssl-0.9.8e/util/mk1mf.pl 2007-04-05 10:30:27.000000000 +0200 -@@ -35,6 +35,7 @@ - "VC-CE", "Microsoft eMbedded Visual C++ 3.0 - Windows CE ONLY", - "VC-NT", "Microsoft Visual C++ [4-6] - Windows NT ONLY", - "Mingw32", "GNU C++ - Windows NT or 9x", -+ "Mingw32-cross", "GNU C++ Linux cross compiling", - "Mingw32-files", "Create files with DOS copy ...", - "BC-NT", "Borland C++ 4.5 - Windows NT", - "linux-elf","Linux elf", -@@ -141,6 +142,10 @@ - { - require 'Mingw32.pl'; - } -+elsif ($platform eq "Mingw32-cross") -+ { -+ require 'Mingw32-cross.pl'; -+ } - elsif ($platform eq "Mingw32-files") - { - require 'Mingw32f.pl'; -diff -Nur openssl-0.9.8e.orig/util/pl/Mingw32-cross.pl openssl-0.9.8e/util/pl/Mingw32-cross.pl ---- openssl-0.9.8e.orig/util/pl/Mingw32-cross.pl 1970-01-01 01:00:00.000000000 +0100 -+++ openssl-0.9.8e/util/pl/Mingw32-cross.pl 2007-04-05 10:30:27.000000000 +0200 -@@ -0,0 +1,95 @@ -+#!/usr/local/bin/perl -+# -+# Mingw32.pl -- Mingw -+# -+ -+$o='/'; -+$cp='cp'; -+$rm='rm -f'; -+$mkdir='mkdir -p'; -+ -+# C compiler stuff -+ -+$cc='$(CROSS)gcc'; -+if ($debug) -+ { $cflags="-DL_ENDIAN -DDSO_WIN32 -g2 -ggdb -DCURSOR_SHOWING=1"; } -+else -+ { $cflags="-DL_ENDIAN -DDSO_WIN32 -fomit-frame-pointer -O3 -march=i586 -Wall -DCURSOR_SHOWING=1 -DOPENSSL_BN_ASM_PART_WORDS"; } -+ -+if ($gaswin and !$no_asm) -+ { -+ $bn_asm_obj='$(OBJ_D)//bn-586-win32.o'; -+ $bn_asm_src='crypto/bn/asm/bn-586-win32.s'; -+ $bnco_asm_obj='$(OBJ_D)/co-586-win32.o'; -+ $bnco_asm_src='crypto/bn/asm/co-586-win32.s'; -+ $des_enc_obj='$(OBJ_D)/crypt586-win32.o $(OBJ_D)/des-586-win32.o'; -+ $des_enc_src='crypto/des/asm/crypt586-win32.s crypto/des/asm/des-586-win32.s'; -+ $bf_enc_obj='$(OBJ_D)/bf-586-win32.o'; -+ $bf_enc_src='crypto/bf/asm/bf-586-win32.s'; -+# $cast_enc_obj='$(OBJ_D)/cast-586-win32.o'; -+# $cast_enc_src='crypto/cast/asm/cast-586-win32.s'; -+ $rc4_enc_obj='$(OBJ_D)/rc4-586-win32.o'; -+ $rc4_enc_src='crypto/rc4/asm/rc4-586-win32.s'; -+ $rc5_enc_obj='$(OBJ_D)/rc5-586-win32.o'; -+ $rc5_enc_src='crypto/rc5/asm/rc5-586-win32.s'; -+ $md5_asm_obj='$(OBJ_D)/md5-586-win32.o'; -+ $md5_asm_src='crypto/md5/asm/md5-586-win32.s'; -+ $rmd160_asm_obj='$(OBJ_D)/rmd-586-win32.o'; -+ $rmd160_asm_src='crypto/ripemd/asm/rmd-586-win32.s'; -+ $sha1_asm_obj='$(OBJ_D)/sha1-586-win32.o'; -+ $sha1_asm_src='crypto/sha/asm/sha1-586-win32.s'; -+ $cpuid_asm_obj='$(OBJ_D)\x86cpuid-win32.o'; -+ $cpuid_asm_src='crypto/x86cpuid-win32.s'; -+ $cflags.=" -DBN_ASM -DMD5_ASM -DSHA1_ASM"; -+ } -+ -+ -+$obj='.o'; -+$ofile='-o '; -+ -+# EXE linking stuff -+$link='${CC}'; -+$lflags='${CFLAGS}'; -+$efile='-o '; -+$exep='.exe'; -+$ex_libs="-lwsock32 -lgdi32"; -+ -+# static library stuff -+$mklib='$(CROSS)ar r'; -+$mlflags=''; -+$ranlib='$(CROSS)ranlib'; -+$plib='lib'; -+$libp=".a"; -+$shlibp=".a"; -+$lfile=''; -+ -+$asm='$(CROSS)as'; -+$afile='-o '; -+ -+sub do_lib_rule -+ { -+ local($obj,$target,$name,$shlib)=@_; -+ local($ret,$_,$Name); -+ -+ $target =~ s/\//$o/g if $o ne '/'; -+ $target="$target"; -+ ($Name=$name) =~ tr/a-z/A-Z/; -+ -+ $ret.="$target: \$(${Name}OBJ)\n"; -+ $ret.="\trm -f $target\n"; -+ $ret.="\t\$(MKLIB) $target \$(${Name}OBJ)\n"; -+ $ret.="\t\$(RANLIB) $target\n\n"; -+ } -+ -+sub do_link_rule -+ { -+ local($target,$files,$dep_libs,$libs)=@_; -+ local($ret,$_); -+ -+ $file =~ s/\//$o/g if $o ne '/'; -+ $n=&bname($target); -+ $ret.="$target: $files $dep_libs\n"; -+ $ret.="\t\$(LINK) ${efile}$target \$(LFLAGS) $files $libs\n\n"; -+ return($ret); -+ } -+1;