diff options
Diffstat (limited to 'dev-libs/crypto++')
| -rw-r--r-- | dev-libs/crypto++/files/crypto++-5.6.2-c++11.patch | 22 | ||||
| -rw-r--r-- | dev-libs/crypto++/files/crypto++-5.6.2-cve-2015-2141.patch | 32 | ||||
| -rw-r--r-- | dev-libs/crypto++/files/crypto++-5.6.2-r1-make.patch | 176 |
3 files changed, 0 insertions, 230 deletions
diff --git a/dev-libs/crypto++/files/crypto++-5.6.2-c++11.patch b/dev-libs/crypto++/files/crypto++-5.6.2-c++11.patch deleted file mode 100644 index 407503606a33..000000000000 --- a/dev-libs/crypto++/files/crypto++-5.6.2-c++11.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 44015c26ba215f955b1e653f9c8f3c894a532707 Mon Sep 17 00:00:00 2001 -From: Jeffrey Walton <noloader@gmail.com> -Date: Tue, 9 Jun 2015 09:49:02 -0400 -Subject: [PATCH] Cleared ill-formed conversion in C++11 - ---- - wake.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/wake.cpp b/wake.cpp -index c34165b..e0f194e 100644 ---- a/wake.cpp -+++ b/wake.cpp -@@ -23,7 +23,7 @@ void WAKE_Base::GenKey(word32 k0, word32 k1, word32 k2, word32 k3) - signed int x, z, p; - // x and z were declared as "long" in Wheeler's paper, which is a signed type. I don't know if that was intentional, but it's too late to change it now. -- Wei 7/4/2010 - CRYPTOPP_COMPILE_ASSERT(sizeof(x) == 4); -- static int tt[10]= { -+ static unsigned int tt[10]= { - 0x726a8f3b, // table - 0xe69a3b5c, - 0xd3c71fe5, diff --git a/dev-libs/crypto++/files/crypto++-5.6.2-cve-2015-2141.patch b/dev-libs/crypto++/files/crypto++-5.6.2-cve-2015-2141.patch deleted file mode 100644 index 32c5164609e9..000000000000 --- a/dev-libs/crypto++/files/crypto++-5.6.2-cve-2015-2141.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 9425e16437439e68c7d96abef922167d68fafaff Mon Sep 17 00:00:00 2001 -From: Jeffrey Walton <noloader@gmail.com> -Date: Sat, 27 Jun 2015 17:56:01 -0400 -Subject: [PATCH] Fix for CVE-2015-2141. Thanks to Evgeny Sidorov for - reporting. Squaring to satisfy Jacobi requirements suggested by JPM. - ---- - rw.cpp | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - -diff --git a/rw.cpp b/rw.cpp -index cdd9f2d..0b9318b 100644 ---- a/rw.cpp -+++ b/rw.cpp -@@ -126,10 +126,16 @@ Integer InvertibleRWFunction::CalculateInverse(RandomNumberGenerator &rng, const - DoQuickSanityCheck(); - ModularArithmetic modn(m_n); - Integer r, rInv; -- do { // do this in a loop for people using small numbers for testing -+ -+ // do this in a loop for people using small numbers for testing -+ do { - r.Randomize(rng, Integer::One(), m_n - Integer::One()); -+ // Fix for CVE-2015-2141. Thanks to Evgeny Sidorov for reporting. -+ // Squaring to satisfy Jacobi requirements suggested by JPM. -+ r = modn.Square(r); - rInv = modn.MultiplicativeInverse(r); - } while (rInv.IsZero()); -+ - Integer re = modn.Square(r); - re = modn.Multiply(re, x); // blind - diff --git a/dev-libs/crypto++/files/crypto++-5.6.2-r1-make.patch b/dev-libs/crypto++/files/crypto++-5.6.2-r1-make.patch deleted file mode 100644 index fa1672328c1d..000000000000 --- a/dev-libs/crypto++/files/crypto++-5.6.2-r1-make.patch +++ /dev/null @@ -1,176 +0,0 @@ ---- cryptopp562/GNUmakefile -+++ cryptopp562/GNUmakefile -@@ -1,3 +1,5 @@ -+LIBTOOL = libtool -+LIBDIR = lib - CXXFLAGS = -DNDEBUG -g -O2 - # -O3 fails to link on Cygwin GCC version 4.5.3 - # -fPIC is supported. Please report any breakage of -fPIC as a bug. -@@ -7,8 +9,9 @@ - # LDFLAGS += -Wl,--gc-sections - ARFLAGS = -cr # ar needs the dash on OpenBSD - RANLIB = ranlib --CP = cp -+LN_S = ln -s - MKDIR = mkdir -+INSTALL = install - EGREP = egrep - UNAME = $(shell uname) - ISX86 = $(shell uname -m | $(EGREP) -c "i.86|x86|i86|amd64") -@@ -79,8 +82,11 @@ - LDLIBS += -lws2_32 - endif - -+THREAD_LIBS = -+ - ifeq ($(IS_LINUX),1) - LDFLAGS += -pthread -+THREAD_LIBS += -lpthread - ifneq ($(shell uname -i | $(EGREP) -c "(_64|d64)"),0) - M32OR64 = -m64 - endif -@@ -126,54 +132,52 @@ - SRCS = $(shell echo *.cpp) - endif - --OBJS = $(SRCS:.cpp=.o) --# test.o needs to be after bench.o for cygwin 1.1.4 (possible ld bug?) --TESTOBJS = bench.o bench2.o test.o validat1.o validat2.o validat3.o adhoc.o datatest.o regtest.o fipsalgt.o dlltest.o -+OBJS = $(SRCS:.cpp=.lo) -+# test.lo needs to be after bench.lo for cygwin 1.1.4 (possible ld bug?) -+TESTOBJS = bench.lo bench2.lo test.lo validat1.lo validat2.lo validat3.lo adhoc.lo datatest.lo regtest.lo fipsalgt.lo dlltest.lo - LIBOBJS = $(filter-out $(TESTOBJS),$(OBJS)) - - DLLSRCS = algebra.cpp algparam.cpp asn.cpp basecode.cpp cbcmac.cpp channels.cpp cryptlib.cpp des.cpp dessp.cpp dh.cpp dll.cpp dsa.cpp ec2n.cpp eccrypto.cpp ecp.cpp eprecomp.cpp files.cpp filters.cpp fips140.cpp fipstest.cpp gf2n.cpp gfpcrypt.cpp hex.cpp hmac.cpp integer.cpp iterhash.cpp misc.cpp modes.cpp modexppc.cpp mqueue.cpp nbtheory.cpp oaep.cpp osrng.cpp pch.cpp pkcspad.cpp pubkey.cpp queue.cpp randpool.cpp rdtables.cpp rijndael.cpp rng.cpp rsa.cpp sha.cpp simple.cpp skipjack.cpp strciphr.cpp trdlocal.cpp --DLLOBJS = $(DLLSRCS:.cpp=.export.o) --LIBIMPORTOBJS = $(LIBOBJS:.o=.import.o) --TESTIMPORTOBJS = $(TESTOBJS:.o=.import.o) --DLLTESTOBJS = dlltest.dllonly.o -- --all: cryptest.exe --static: libcryptopp.a --dynamic: libcryptopp.so -+DLLOBJS = $(DLLSRCS:.cpp=.export.lo) -+LIBIMPORTOBJS = $(LIBOBJS:.lo=.import.lo) -+TESTIMPORTOBJS = $(TESTOBJS:.lo=.import.lo) -+DLLTESTOBJS = dlltest.dllonly.lo -+ -+all: libcrypto++.la - --test: cryptest.exe -- ./cryptest.exe v -+test: cryptest -+ ./cryptest v - - clean: -- -$(RM) cryptest.exe libcryptopp.a libcryptopp.so $(LIBOBJS) $(TESTOBJS) cryptopp.dll libcryptopp.dll.a libcryptopp.import.a cryptest.import.exe dlltest.exe $(DLLOBJS) $(LIBIMPORTOBJS) $(TESTI MPORTOBJS) $(DLLTESTOBJS) -+ $(RM) -f .libs cryptest libcrypto++.* libcryptopp.* $(LIBOBJS) $(TESTOBJS) cryptopp.dll cryptest.import dlltest $(DLLOBJS) $(LIBIMPORTOBJS) $(TESTIMPORTOBJS) $(DLLTESTOBJS) -+ - - install: -- $(MKDIR) -p $(PREFIX)/include/cryptopp $(PREFIX)/lib $(PREFIX)/bin -- -$(CP) *.h $(PREFIX)/include/cryptopp -- -$(CP) *.a $(PREFIX)/lib -- -$(CP) *.so $(PREFIX)/lib -- -$(CP) *.exe $(PREFIX)/bin -+ $(MKDIR) -p $(DESTDIR)$(PREFIX)/include/crypto++ $(DESTDIR)$(PREFIX)/$(LIBDIR) -+ $(INSTALL) -m 644 *.h $(DESTDIR)$(PREFIX)/include/crypto++ -+ $(LN_S) crypto++ $(DESTDIR)$(PREFIX)/include/cryptopp -+ $(LIBTOOL) --mode=install $(INSTALL) libcrypto++.la $(DESTDIR)$(PREFIX)/$(LIBDIR) -+ set -e; \ -+ for f in $(DESTDIR)$(PREFIX)/$(LIBDIR)/libcrypto++*; do \ -+ $(LN_S) $${f##*/} `echo $$f | sed "s:libcrypto++:libcryptopp:"`; \ -+ done - - remove: -- -$(RM) -rf $(PREFIX)/include/cryptopp -- -$(RM) $(PREFIX)/lib/libcryptopp.a -- -$(RM) $(PREFIX)/lib/libcryptopp.so -- -$(RM) $(PREFIX)/bin/cryptest.exe -- --libcryptopp.a: $(LIBOBJS) -- $(AR) $(ARFLAGS) $@ $(LIBOBJS) -- $(RANLIB) $@ -+ $(RM) -rf $(DESTDIR)$(PREFIX)/include/crypto++ -+ $(RM) $(DESTDIR)$(PREFIX)/$(LIBDIR)/libcryptopp.* -+ $(RM) $(DESTDIR)$(PREFIX)/$(LIBDIR)/libcrypto++.* -+ $(RM) $(DESTDIR)$(PREFIX)/bin/cryptest - --libcryptopp.so: $(LIBOBJS) -- $(CXX) -shared -o $@ $(LIBOBJS) -+libcrypto++.la: $(LIBOBJS) -+ $(LIBTOOL) --tag=CXX --mode=link $(CXX) $(LDFLAGS) -rpath $(PREFIX)/$(LIBDIR) -o $@ $(LIBOBJS) $(THREAD_LIBS) - --cryptest.exe: libcryptopp.a $(TESTOBJS) -- $(CXX) -o $@ $(CXXFLAGS) $(TESTOBJS) ./libcryptopp.a $(LDFLAGS) $(LDLIBS) -+cryptest: libcrypto++.la $(TESTOBJS) -+ $(LIBTOOL) --tag=CXX --mode=link $(CXX) $(LDFLAGS) -o $@ $(TESTOBJS) -L. -lcrypto++ $(LDLIBS) $(THREAD_LIBS) - - nolib: $(OBJS) # makes it faster to test changes -- $(CXX) -o ct $(CXXFLAGS) $(OBJS) $(LDFLAGS) $(LDLIBS) -+ $(LIBTOOL) --tag=CXX --mode=link $(CXX) -o ct $(LDFLAGS) $(OBJS) $(LDLIBS) $(THREAD_LIBS) - --dll: cryptest.import.exe dlltest.exe -+dll: cryptest.import dlltest - - cryptopp.dll: $(DLLOBJS) - $(CXX) -shared -o $@ $(CXXFLAGS) $(DLLOBJS) $(LDFLAGS) $(LDLIBS) -Wl,--out-implib=libcryptopp.dll.a -@@ -182,10 +186,10 @@ - $(AR) $(ARFLAGS) $@ $(LIBIMPORTOBJS) - $(RANLIB) $@ - --cryptest.import.exe: cryptopp.dll libcryptopp.import.a $(TESTIMPORTOBJS) -+cryptest.import: cryptopp.dll libcryptopp.import.a $(TESTIMPORTOBJS) - $(CXX) -o $@ $(CXXFLAGS) $(TESTIMPORTOBJS) -L. -lcryptopp.dll -lcryptopp.import $(LDFLAGS) $(LDLIBS) - --dlltest.exe: cryptopp.dll $(DLLTESTOBJS) -+dlltest: cryptopp.dll $(DLLTESTOBJS) - $(CXX) -o $@ $(CXXFLAGS) $(DLLTESTOBJS) -L. -lcryptopp.dll $(LDFLAGS) $(LDLIBS) - - adhoc.cpp: adhoc.cpp.proto -@@ -195,14 +199,14 @@ - touch adhoc.cpp - endif - --%.dllonly.o : %.cpp -+%.dllonly.lo : %.cpp - $(CXX) $(CXXFLAGS) -DCRYPTOPP_DLL_ONLY -c $< -o $@ - --%.import.o : %.cpp -+%.import.lo : %.cpp - $(CXX) $(CXXFLAGS) -DCRYPTOPP_IMPORTS -c $< -o $@ - --%.export.o : %.cpp -+%.export.lo : %.cpp - $(CXX) $(CXXFLAGS) -DCRYPTOPP_EXPORTS -c $< -o $@ - --%.o : %.cpp -- $(CXX) $(CXXFLAGS) -c $< -+%.lo : %.cpp -+ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(CXXFLAGS) -c $< -From 0088b78b23ede2abb0e8ab08345ac334d8c1ad64 Mon Sep 17 00:00:00 2001 -From: Alon Bar-Lev <alon.barlev@gmail.com> -Date: Thu, 7 Apr 2016 23:30:48 +0300 -Subject: [PATCH] build: remove native CXXFLAGS override - ---- - GNUmakefile | 3 --- - 1 file changed, 3 deletions(-) - -diff --git a/GNUmakefile b/GNUmakefile -index b1ab537..a0c6c13 100644 ---- a/GNUmakefile -+++ b/GNUmakefile -@@ -38,9 +38,7 @@ GAS219_OR_LATER = $(shell $(CXX) -xc -c /dev/null -Wa,-v -o/dev/null 2>&1 | $(EG - ifneq ($(GCC42_OR_LATER),0) - ifeq ($(UNAME),Darwin) - CXXFLAGS += -arch x86_64 -arch i386 --else --CXXFLAGS += -march=native - endif - endif - - ifneq ($(INTEL_COMPILER),0) --- -2.7.3 - |