summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlon Bar-Lev <alonbl@gentoo.org>2015-07-02 19:16:49 +0000
committerAlon Bar-Lev <alonbl@gentoo.org>2015-07-02 19:16:49 +0000
commitc5a18928d8a38dfaf668fc87c8f3d7e299a0ec5c (patch)
treedacc3fed44776c0075d50c8ecb785c1506febb4d /dev-libs/crypto++
parentFix cve-2015-2141, bug#553808 (diff)
downloadhistorical-c5a18928d8a38dfaf668fc87c8f3d7e299a0ec5c.tar.gz
historical-c5a18928d8a38dfaf668fc87c8f3d7e299a0ec5c.tar.bz2
historical-c5a18928d8a38dfaf668fc87c8f3d7e299a0ec5c.zip
Cleanup leftovers
Package-Manager: portage-2.2.18/cvs/Linux x86_64 Manifest-Sign-Key: 0xBF20DC51
Diffstat (limited to 'dev-libs/crypto++')
-rw-r--r--dev-libs/crypto++/ChangeLog10
-rw-r--r--dev-libs/crypto++/Manifest14
-rw-r--r--dev-libs/crypto++/files/crypto++-5.6.1-fix_build_system.patch124
-rw-r--r--dev-libs/crypto++/files/crypto++-5.6.1-gcc-4.7.patch120
-rw-r--r--dev-libs/crypto++/files/crypto++-5.6.1-r3-fix_build_system.patch152
-rw-r--r--dev-libs/crypto++/files/crypto++-5.6.1-rijndael.patch14
-rw-r--r--dev-libs/crypto++/files/crypto++-5.6.1-sunos.patch19
-rw-r--r--dev-libs/crypto++/files/crypto++-5.6.2-make.patch150
8 files changed, 13 insertions, 590 deletions
diff --git a/dev-libs/crypto++/ChangeLog b/dev-libs/crypto++/ChangeLog
index c70dbef4f976..da39d0f968d0 100644
--- a/dev-libs/crypto++/ChangeLog
+++ b/dev-libs/crypto++/ChangeLog
@@ -1,6 +1,14 @@
# ChangeLog for dev-libs/crypto++
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/crypto++/ChangeLog,v 1.99 2015/07/02 19:13:48 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/crypto++/ChangeLog,v 1.100 2015/07/02 19:16:42 alonbl Exp $
+
+ 02 Jul 2015; Alon Bar-Lev <alonbl@gentoo.org>
+ -files/crypto++-5.6.1-fix_build_system.patch,
+ -files/crypto++-5.6.1-gcc-4.7.patch,
+ -files/crypto++-5.6.1-r3-fix_build_system.patch,
+ -files/crypto++-5.6.1-rijndael.patch, -files/crypto++-5.6.1-sunos.patch,
+ -files/crypto++-5.6.2-make.patch:
+ Cleanup leftovers
*crypto++-5.6.2-r2 (02 Jul 2015)
diff --git a/dev-libs/crypto++/Manifest b/dev-libs/crypto++/Manifest
index 0018ded1b89d..6f99f6591f1d 100644
--- a/dev-libs/crypto++/Manifest
+++ b/dev-libs/crypto++/Manifest
@@ -1,23 +1,17 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
-AUX crypto++-5.6.1-fix_build_system.patch 5008 SHA256 cc2c823046f38c154f7cc6899ff2cb94bb378bfbbb534662246d378e751f0480 SHA512 c457b6bb7366915087e4af85b57cc8482f65363d45f665804cdec9072846b7c864f7def5851d46a892cd05365984910bee8516cd07cfdf0b7b3b73973328abef WHIRLPOOL 3b1a7a105df55246a3532db2812dc89229f2ea564bcaaab254226299402e2745cf298e202d1ed2e8d1729e06f8705c024add05c6d2258c81d2c2e0c2f5efc510
-AUX crypto++-5.6.1-gcc-4.7.patch 4442 SHA256 e4b13387ad5f0a2089565709b5fbf95790f50c2e710af153b94faa15dc351ff1 SHA512 1f5b80964a4dea1d5f37ab893170856ba0b78adea45cc149241cfbb6545999c495169724e3d8521457ca718623157845c2eba39b53bbb37e23a8e0b05f8e13d7 WHIRLPOOL 9a96a92c17188d9986b3c40d738b1bb95af21cc8a3fa08556c073ca3a0dfa8c169bbcd39dc605490ea8c88771ee58ef859d9c623fcb99127d5d26e2ad86075c5
-AUX crypto++-5.6.1-r3-fix_build_system.patch 5684 SHA256 b66efd9b50efc66afa06e19601646fd6e4f93f1bc8424192efee3d6e5c8cf514 SHA512 4c60a46c2df6661abcb3bfb83d53a509a7cc0f77c24983f386ea2df1ffd95ee3ecbbc1291ab953553cdab95bec801641e934b5efea8b785869df41bd83067c76 WHIRLPOOL 3f654ca98d5ec603820a1369f718131728cf38f32b19c3e7c7c59248cb37490d58ccd159de5dac0b71985f0bdcfd08a1737535d781f142985b53f57718e5c9a4
-AUX crypto++-5.6.1-rijndael.patch 578 SHA256 8d5c406987a1a98c3e2aa5c1046d86bc3ff2c7af6c487b70b8b0fa9cb938ca0c SHA512 02ba1c83a19865c74faa62046b8199138b951b59a79aaae036268fff64ae0d6ba7bc98ab791c17a446d7aaecc526c6b603b1b9d0d513ce349d5a2ff4032d3401 WHIRLPOOL 4aa8bfd92090a7eb75a686bd6ae42bdc5cb5bc620bfb3358cb51ea1a0ad581a9030084512b85808c81361822bd5bcdc265b7d39db0ee8f4d52467da7ffff45e9
-AUX crypto++-5.6.1-sunos.patch 546 SHA256 fb0bc4e48dc55100dd0a454b86a98c949faa79d77967840a9afa0e0ac1ac531c SHA512 9682e7aaf140c3587dcb0db5ed0bb906e6ccf4f343c17979ffcf4099a5f600a31510e86c1efcf392c8f4cdda0ed6abab5ba87a124b83b26f7ab1b2cbc10e2acd WHIRLPOOL cceec55658ac7436bbb4a8af712044d83336fde54637114d8ff1579af485f0d8e50c8d737028dc02195534b511eda2cca02d8b366877e6ef8dd541b605925154
AUX crypto++-5.6.2-cve-2015-2141.patch 1131 SHA256 611980b01fd4292bc40b929e62a0cdecf1ea87c8b4639bca7c286b83c8c948fc SHA512 4407833fbfb44c3571edccd916323a97427ee3c0f37b49d5a6851a196e6913954801cb9df3b01b956e8d990904fb710a0a57918c44596e8218b4c08b1b729bf1 WHIRLPOOL 5380572f224181f1da27a5f71448be7169be0c78c2f04a219f7fb3fca95446b26d27c62d03b2270f915f24ec1243b6ae9f761c9345a9aec7a7597ae670ce4697
-AUX crypto++-5.6.2-make.patch 5757 SHA256 1c74320e5111e688e1623b3672d248339c230e240b77a6ff71ef1d07dc005d7a SHA512 c237010ebea7efb9602aa2eaa2d81a3f87a51b60530229458ca3af719b4ee6652a9622672a409a9f5deb6af0adeb4d184c9e5b37bcd89d904cff052d466bb6c6 WHIRLPOOL 55a0b8dd74b3306b1a89df99036388e640824783df7bc67701cabfa7e2abe5946e4553731fcba7503155d8873055a82086c7d69a858a61ff8d9842b043408a6a
AUX crypto++-5.6.2-r1-make.patch 5600 SHA256 7fd192a4acebf2c8706b322a7682e283a8338819ea10aa3405b6bb8b08406f36 SHA512 cb95468f5b1f61bfffa96519cc98038c9d2f39b3aae42734d92d082d2283b5fdb0841d0873d7d6bb9177120982fbaf70a6973f3f40de31aab070827d708d348d WHIRLPOOL 5b7353f38575aea281c0515e06bf291a05c325336b3f3559007993f5a32df297afccfb39b1fe4a15722c5cf54fc7c337a0cf2de470cf2d08d81e9a946b341783
DIST cryptopp562.zip 1137964 SHA256 5cbfd2fcb4a6b3aab35902e2e0f3b59d9171fee12b3fc2b363e1801dfec53574 SHA512 016ca7ebad1091d67ad0bc5ccb7549d96d4af6b563d9d5a612cae27b3d1a3514c41b954e319fed91c820e8c701e3aa43da186e0864bf959ce4afd1539248ebbe WHIRLPOOL e31203da48a31b09e6ea48a75aa64fe5fd27fd370a1a609c4387526f09daab7582716563b688c0c81a8c3b200b8ffa7bdb2b981e5911640e5f1c172d6027f6ac
EBUILD crypto++-5.6.2-r1.ebuild 1889 SHA256 0935bd9658504442cd9fa444ef1a22556a5d2cf786e6780c0b09f58538c7fe1f SHA512 c2326440b698575540eb6ac32b9eed8ba972943584b103ce1636ada6ee6aaf47fba2949457dd1790d02bbaeb2952c8bb6d742686cfcb0d9bb13bb4f9dc9debe5 WHIRLPOOL 662d7251e265171eaaa0555e2456a7bc13e024dcff3620529c4589af3297011a14014a7895eca6fa1c6112529b04953baf7bcc055eb333ac4651920a90791a74
EBUILD crypto++-5.6.2-r2.ebuild 1947 SHA256 c8e8269ceb700cff4d99375774dc86c2195928c55b969b731237a88cd52386a8 SHA512 1d6a8727cbfd11f0ba8c1798a63beacc216d34953280c101b4af1dbc7ab39025e94eb2ffab9a45e99d3eb7e38784ce4d800300d5e61d55aaf4a1ce0f9ce18dbe WHIRLPOOL bf9e8a26ef13261641855f9bacdcd089a20b8c98a86362e3a9723ac4e9c3c32569f104657bad4880bb770c8fb31671cbd86d017e53bbd1b9c2ec85e52768becb
-MISC ChangeLog 14476 SHA256 43e22ebd591e6d95b0c64968fe7666295f2293cb043b106e62a98975dd453fdd SHA512 87c9dce0c648d3779af5f4e688b102bb628bd3c67643a6d5060769d80410c2253b62b2fe67b7b42cafcc0d3ccc7a168767e8299603315c240edbea4668e66597 WHIRLPOOL a20d754987baa9cbe99f52cfede560a571f3808be8e26a12a6bc9728219e084f3ae329a0c71b3bc17a43cb609811cc82d206532afefd2b9eec105b4b1ed58079
+MISC ChangeLog 14795 SHA256 bb26d2c3fefcd3c495a16263005c937bb62cd1ceb5657d619d1fc93e1a35ee86 SHA512 ce7f10662af82e2ca517714d715b1528ffc656a8c8cd7a8e52722a165fa242c76033f8c11f115d5c464061ec21cbf790ff22d6cd9fd1709e4b09db374312934c WHIRLPOOL d9b9b84c849321518814e2988d895d20590f752373f5d6ac463068c043acb3366b9cf1e52e1524ece01b89c15408e6e8efe14faa8c535c3aa2326fd32412768e
MISC metadata.xml 238 SHA256 6016bce582e1c161d797f47c30e8eff1874b020bb6fee9e490d04e1d99311194 SHA512 35c41d4b5cc45959f8f24254a34dd72298cd23f834e5b15861f1c990510e847e7c962bc2716cd849d318a4afcb79d967eb1b877e7eeac17c9a9eeed02ae9e89e WHIRLPOOL a16d6d589a1c3ca2311c570993ff64e6919c7ec60877f91ad0e1cf31c6e8c65128120f454d6b54728db5bd8c7ec17df5e130378bbcbcbdefa2c2b20326fb4e1e
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
-iF4EAREIAAYFAlWVjW8ACgkQXYk9GL8g3FFLoQD/TdET0O7825v0/ajMbKeTcdG6
-svwvAgixOi/vwQWLg5cA/Rzr5ZC1JfCHzROzu0FDxZzib/JYiAYTEL0Qxr9pdmmi
-=b0gW
+iF4EAREIAAYFAlWVjh4ACgkQXYk9GL8g3FFQxAD/V9QAfx77c6VcKqB/9FuPirZR
+1sdi+hHskjXmYsZLqREA/36dj6qrEznF260M/XQJoYaDcPC/ElGDItzYdC2RdiBA
+=e9OV
-----END PGP SIGNATURE-----
diff --git a/dev-libs/crypto++/files/crypto++-5.6.1-fix_build_system.patch b/dev-libs/crypto++/files/crypto++-5.6.1-fix_build_system.patch
deleted file mode 100644
index 829e9bf782cb..000000000000
--- a/dev-libs/crypto++/files/crypto++-5.6.1-fix_build_system.patch
+++ /dev/null
@@ -1,124 +0,0 @@
---- GNUmakefile
-+++ GNUmakefile
-@@ -1,3 +1,5 @@
-+LIBTOOL = libtool
-+LIBDIR = lib
- CXXFLAGS = -DNDEBUG -g -O2
- #CXXFLAGS = -g
- # -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")
-@@ -120,46 +123,45 @@
- 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
-+DLLOBJS = $(DLLSRCS:.cpp=.export.lo)
-+LIBIMPORTOBJS = $(LIBOBJS:.lo=.import.lo)
-+TESTIMPORTOBJS = $(TESTOBJS:.lo=.import.lo)
-+DLLTESTOBJS = dlltest.dllonly.lo
-
--all: cryptest.exe
-+all: libcrypto++.la
-
--test: cryptest.exe
-- ./cryptest.exe v
-+test: cryptest
-+ ./cryptest v
-
- clean:
-- $(RM) cryptest.exe libcryptopp.a $(LIBOBJS) $(TESTOBJS) cryptopp.dll libcryptopp.dll.a libcryptopp.import.a cryptest.import.exe dlltest.exe $(DLLOBJS) $(LIBIMPORTOBJS) $(TESTIMPORTOBJS) $(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)
-+ $(LN_S) libcrypto++.a $(DESTDIR)$(PREFIX)/$(LIBDIR)/libcryptopp.a
-+ $(LN_S) libcrypto++.so.0.0.0 $(DESTDIR)$(PREFIX)/$(LIBDIR)/libcryptopp.so
-+ $(LN_S) libcrypto++.so.0.0.0 $(DESTDIR)$(PREFIX)/$(LIBDIR)/libcryptopp.so.0
-+ $(LN_S) libcrypto++.so.0.0.0 $(DESTDIR)$(PREFIX)/$(LIBDIR)/libcryptopp.so.0.0.0
-
--libcryptopp.a: $(LIBOBJS)
-- $(AR) $(ARFLAGS) $@ $(LIBOBJS)
-- $(RANLIB) $@
--
--libcryptopp.so: $(LIBOBJS)
-- $(CXX) -shared -o $@ $(LIBOBJS)
-+libcrypto++.la: $(LIBOBJS)
-+ $(LIBTOOL) --tag=CC --mode=link $(CXX) $(LDFLAGS) -rpath $(PREFIX)/$(LIBDIR) -o $@ $(LIBOBJS)
-
--cryptest.exe: libcryptopp.a $(TESTOBJS)
-- $(CXX) -o $@ $(CXXFLAGS) $(TESTOBJS) -L. -lcryptopp $(LDFLAGS) $(LDLIBS)
-+cryptest: libcrypto++.la $(TESTOBJS)
-+ $(LIBTOOL) --tag=CC --mode=link $(CXX) $(LDFLAGS) -o $@ $(TESTOBJS) -L. -lcrypto++ $(LDLIBS)
-
- nolib: $(OBJS) # makes it faster to test changes
-- $(CXX) -o ct $(CXXFLAGS) $(OBJS) $(LDFLAGS) $(LDLIBS)
-+ $(LIBTOOL) --tag=CC --mode=link $(CXX) -o ct $(LDFLAGS) $(OBJS) $(LDLIBS)
-
--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
-@@ -168,10 +170,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
-@@ -181,14 +183,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 $<
diff --git a/dev-libs/crypto++/files/crypto++-5.6.1-gcc-4.7.patch b/dev-libs/crypto++/files/crypto++-5.6.1-gcc-4.7.patch
deleted file mode 100644
index cd6147aebf20..000000000000
--- a/dev-libs/crypto++/files/crypto++-5.6.1-gcc-4.7.patch
+++ /dev/null
@@ -1,120 +0,0 @@
-https://bugs.gentoo.org/403197
-http://sourceforge.net/apps/trac/cryptopp/ticket/14
-http://sourceforge.net/apps/trac/cryptopp/attachment/ticket/14/gcc4.7.diff
-
-diff --git a/algebra.cpp b/algebra.cpp
-index 78c3947..d4bfc57 100644
---- a/algebra.cpp
-+++ b/algebra.cpp
-@@ -58,7 +58,7 @@ template <class T> const T& AbstractEuclideanDomain<T>::Gcd(const Element &a, co
- Element g[3]={b, a};
- unsigned int i0=0, i1=1, i2=2;
-
-- while (!Equal(g[i1], this->Identity()))
-+ while (!this->Equal(g[i1], this->Identity()))
- {
- g[i2] = Mod(g[i0], g[i1]);
- unsigned int t = i0; i0 = i1; i1 = i2; i2 = t;
-@@ -74,7 +74,7 @@ template <class T> const typename QuotientRing<T>::Element& QuotientRing<T>::Mul
- Element y;
- unsigned int i0=0, i1=1, i2=2;
-
-- while (!Equal(g[i1], Identity()))
-+ while (!this->Equal(g[i1], Identity()))
- {
- // y = g[i0] / g[i1];
- // g[i2] = g[i0] % g[i1];
-diff --git a/eccrypto.cpp b/eccrypto.cpp
-index fd8462f..922104c 100644
---- a/eccrypto.cpp
-+++ b/eccrypto.cpp
-@@ -435,7 +435,7 @@ template <class EC> void DL_GroupParameters_EC<EC>::Initialize(const OID &oid)
- StringSource ssG(param.g, true, new HexDecoder);
- Element G;
- bool result = GetCurve().DecodePoint(G, ssG, (size_t)ssG.MaxRetrievable());
-- SetSubgroupGenerator(G);
-+ this->SetSubgroupGenerator(G);
- assert(result);
-
- StringSource ssN(param.n, true, new HexDecoder);
-@@ -591,7 +591,7 @@ bool DL_GroupParameters_EC<EC>::ValidateElement(unsigned int level, const Elemen
- if (level >= 2 && pass)
- {
- const Integer &q = GetSubgroupOrder();
-- Element gq = gpc ? gpc->Exponentiate(this->GetGroupPrecomputation(), q) : ExponentiateElement(g, q);
-+ Element gq = gpc ? gpc->Exponentiate(this->GetGroupPrecomputation(), q) : this->ExponentiateElement(g, q);
- pass = pass && IsIdentity(gq);
- }
- return pass;
-@@ -629,7 +629,7 @@ void DL_PublicKey_EC<EC>::BERDecodePublicKey(BufferedTransformation &bt, bool pa
- typename EC::Point P;
- if (!this->GetGroupParameters().GetCurve().DecodePoint(P, bt, size))
- BERDecodeError();
-- SetPublicElement(P);
-+ this->SetPublicElement(P);
- }
-
- template <class EC>
-diff --git a/eccrypto.h b/eccrypto.h
-index b359e03..3530455 100644
---- a/eccrypto.h
-+++ b/eccrypto.h
-@@ -43,7 +43,7 @@ public:
- void Initialize(const EllipticCurve &ec, const Point &G, const Integer &n, const Integer &k = Integer::Zero())
- {
- this->m_groupPrecomputation.SetCurve(ec);
-- SetSubgroupGenerator(G);
-+ this->SetSubgroupGenerator(G);
- m_n = n;
- m_k = k;
- }
-@@ -145,9 +145,9 @@ public:
- typedef typename EC::Point Element;
-
- void Initialize(const DL_GroupParameters_EC<EC> &params, const Element &Q)
-- {this->AccessGroupParameters() = params; SetPublicElement(Q);}
-+ {this->AccessGroupParameters() = params; this->SetPublicElement(Q);}
- void Initialize(const EC &ec, const Element &G, const Integer &n, const Element &Q)
-- {this->AccessGroupParameters().Initialize(ec, G, n); SetPublicElement(Q);}
-+ {this->AccessGroupParameters().Initialize(ec, G, n); this->SetPublicElement(Q);}
-
- // X509PublicKey
- void BERDecodePublicKey(BufferedTransformation &bt, bool parametersPresent, size_t size);
-@@ -166,9 +166,9 @@ public:
- void Initialize(const EC &ec, const Element &G, const Integer &n, const Integer &x)
- {this->AccessGroupParameters().Initialize(ec, G, n); this->SetPrivateExponent(x);}
- void Initialize(RandomNumberGenerator &rng, const DL_GroupParameters_EC<EC> &params)
-- {GenerateRandom(rng, params);}
-+ {this->GenerateRandom(rng, params);}
- void Initialize(RandomNumberGenerator &rng, const EC &ec, const Element &G, const Integer &n)
-- {GenerateRandom(rng, DL_GroupParameters_EC<EC>(ec, G, n));}
-+ {this->GenerateRandom(rng, DL_GroupParameters_EC<EC>(ec, G, n));}
-
- // PKCS8PrivateKey
- void BERDecodePrivateKey(BufferedTransformation &bt, bool parametersPresent, size_t size);
-diff --git a/panama.cpp b/panama.cpp
-index 09b1708..a1a37d6 100644
---- a/panama.cpp
-+++ b/panama.cpp
-@@ -422,7 +422,7 @@ void PanamaHash<B>::TruncatedFinal(byte *hash, size_t size)
- {
- this->ThrowIfInvalidTruncatedSize(size);
-
-- PadLastBlock(this->BLOCKSIZE, 0x01);
-+ this->PadLastBlock(this->BLOCKSIZE, 0x01);
-
- HashEndianCorrectedBlock(this->m_data);
-
-diff --git a/secblock.h b/secblock.h
-index 24b9fc0..40cce33 100644
---- a/secblock.h
-+++ b/secblock.h
-@@ -88,7 +88,7 @@ public:
-
- pointer allocate(size_type n, const void * = NULL)
- {
-- CheckSize(n);
-+ this->CheckSize(n);
- if (n == 0)
- return NULL;
-
diff --git a/dev-libs/crypto++/files/crypto++-5.6.1-r3-fix_build_system.patch b/dev-libs/crypto++/files/crypto++-5.6.1-r3-fix_build_system.patch
deleted file mode 100644
index c4b22e41aeea..000000000000
--- a/dev-libs/crypto++/files/crypto++-5.6.1-r3-fix_build_system.patch
+++ /dev/null
@@ -1,152 +0,0 @@
---- GNUmakefile
-+++ GNUmakefile
-@@ -1,3 +1,5 @@
-+LIBTOOL = libtool
-+LIBDIR = lib
- CXXFLAGS = -DNDEBUG -g -O2
- #CXXFLAGS = -g
- # -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")
-@@ -77,8 +80,11 @@
- CXXFLAGS += -pipe
- endif
-
-+THREAD_LIBS =
-+
- ifeq ($(UNAME),Linux)
- LDFLAGS += -pthread
-+THREAD_LIBS += -lpthread
- ifneq ($(shell uname -i | $(EGREP) -c "(_64|d64)"),0)
- M32OR64 = -m64
- endif
-@@ -99,8 +105,6 @@
- ifeq ($(UNAME),SunOS)
- LDLIBS += -lnsl -lsocket
- M32OR64 = -m$(shell isainfo -b)
--endif
--
- ifneq ($(IS_SUN_CC),0) # override flags for CC Sun C++ compiler
- CXXFLAGS = -DNDEBUG -O -g0 -native -template=no%extdef $(M32OR64)
- LDFLAGS =
-@@ -114,52 +118,52 @@
- CXXFLAGS += -DCRYPTOPP_INCLUDE_VECTOR_CC
- endif
- endif
-+endif
-
- SRCS = $(wildcard *.cpp)
- ifeq ($(SRCS),) # workaround wildcard function bug in GNU Make 3.77
- 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
-+DLLOBJS = $(DLLSRCS:.cpp=.export.lo)
-+LIBIMPORTOBJS = $(LIBOBJS:.lo=.import.lo)
-+TESTIMPORTOBJS = $(TESTOBJS:.lo=.import.lo)
-+DLLTESTOBJS = dlltest.dllonly.lo
-
--all: cryptest.exe
-+all: libcrypto++.la
-
--test: cryptest.exe
-- ./cryptest.exe v
-+test: cryptest
-+ ./cryptest v
-
- clean:
-- $(RM) cryptest.exe libcryptopp.a $(LIBOBJS) $(TESTOBJS) cryptopp.dll libcryptopp.dll.a libcryptopp.import.a cryptest.import.exe dlltest.exe $(DLLOBJS) $(LIBIMPORTOBJS) $(TESTIMPORTOBJS) $(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
--
--libcryptopp.a: $(LIBOBJS)
-- $(AR) $(ARFLAGS) $@ $(LIBOBJS)
-- $(RANLIB) $@
-+ $(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)
-+ $(LN_S) libcrypto++.a $(DESTDIR)$(PREFIX)/$(LIBDIR)/libcryptopp.a
-+ $(LN_S) libcrypto++.so.0.0.0 $(DESTDIR)$(PREFIX)/$(LIBDIR)/libcryptopp.so
-+ $(LN_S) libcrypto++.so.0.0.0 $(DESTDIR)$(PREFIX)/$(LIBDIR)/libcryptopp.so.0
-+ $(LN_S) libcrypto++.so.0.0.0 $(DESTDIR)$(PREFIX)/$(LIBDIR)/libcryptopp.so.0.0.0
-
--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) -L. -lcryptopp $(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
-@@ -168,10 +172,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
-@@ -181,14 +185,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 $<
diff --git a/dev-libs/crypto++/files/crypto++-5.6.1-rijndael.patch b/dev-libs/crypto++/files/crypto++-5.6.1-rijndael.patch
deleted file mode 100644
index 153fa44b913f..000000000000
--- a/dev-libs/crypto++/files/crypto++-5.6.1-rijndael.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- rijndael.cpp 2010-08-06 18:46:22.000000000 +0200
-+++ rijndael.cpp2 2011-12-27 16:10:52.606933355 +0100
-@@ -349,7 +349,11 @@
- void Rijndael::Enc::ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock, byte *outBlock) const
- {
- #if CRYPTOPP_BOOL_SSE2_ASM_AVAILABLE || defined(CRYPTOPP_X64_MASM_AVAILABLE) || CRYPTOPP_BOOL_AESNI_INTRINSICS_AVAILABLE
-+#if CRYPTOPP_BOOL_SSE2_ASM_AVAILABLE || defined(CRYPTOPP_X64_MASM_AVAILABLE)
- if (HasSSE2())
-+#else
-+ if (HasAESNI())
-+#endif
- {
- Rijndael::Enc::AdvancedProcessBlocks(inBlock, xorBlock, outBlock, 16, 0);
- return;
diff --git a/dev-libs/crypto++/files/crypto++-5.6.1-sunos.patch b/dev-libs/crypto++/files/crypto++-5.6.1-sunos.patch
deleted file mode 100644
index eb3f18e62da6..000000000000
--- a/dev-libs/crypto++/files/crypto++-5.6.1-sunos.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- GNUmakefile.orig 2010-11-04 18:18:03.000000000 +0100
-+++ GNUmakefile 2010-11-04 19:21:29.000000000 +0100
-@@ -102,8 +102,6 @@
- ifeq ($(UNAME),SunOS)
- LDLIBS += -lnsl -lsocket
- M32OR64 = -m$(shell isainfo -b)
--endif
--
- ifneq ($(IS_SUN_CC),0) # override flags for CC Sun C++ compiler
- CXXFLAGS = -DNDEBUG -O -g0 -native -template=no%extdef $(M32OR64)
- LDFLAGS =
-@@ -117,6 +115,7 @@
- CXXFLAGS += -DCRYPTOPP_INCLUDE_VECTOR_CC
- endif
- endif
-+endif
-
- SRCS = $(wildcard *.cpp)
- ifeq ($(SRCS),) # workaround wildcard function bug in GNU Make 3.77
diff --git a/dev-libs/crypto++/files/crypto++-5.6.2-make.patch b/dev-libs/crypto++/files/crypto++-5.6.2-make.patch
deleted file mode 100644
index 535ee91f56f0..000000000000
--- a/dev-libs/crypto++/files/crypto++-5.6.2-make.patch
+++ /dev/null
@@ -1,150 +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)
-+ $(LN_S) libcrypto++.a $(DESTDIR)$(PREFIX)/$(LIBDIR)/libcryptopp.a
-+ $(LN_S) libcrypto++.so.0.0.0 $(DESTDIR)$(PREFIX)/$(LIBDIR)/libcryptopp.so
-+ $(LN_S) libcrypto++.so.0.0.0 $(DESTDIR)$(PREFIX)/$(LIBDIR)/libcryptopp.so.0
-+ $(LN_S) libcrypto++.so.0.0.0 $(DESTDIR)$(PREFIX)/$(LIBDIR)/libcryptopp.so.0.0.0
-
- 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.a
-+ $(RM) $(DESTDIR)$(PREFIX)/$(LIBDIR)/libcryptopp.so*
-+ $(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 $<