Updated crypto++ to 5.5.2.

Changes since 5.2.1:
5.2.2 - added SHA-224
      - put SHA-256, SHA-384, SHA-512, RSASSA-PSS into DLL

5.2.3 - fixed issues with FIPS algorithm test vectors
      - put RSASSA-ISO into DLL

5.3 - ported to MSVC 2005 with support for x86-64
    - added defense against AES timing attacks, and more AES test vectors
    - changed StaticAlgorithmName() of Rijndael to "AES", CTR to "CTR"

5.4 - added Salsa20
    - updated Whirlpool to version 3.0
    - ported to GCC 4.1, Sun C++ 5.8, and Borland C++Builder 2006

5.5 - added VMAC and Sosemanuk (with x86-64 and SSE2 assembly)
    - improved speed of integer arithmetic, AES, SHA-512, Tiger, Salsa20,
      Whirlpool, and PANAMA cipher using assembly (x86-64, MMX, SSE2)
    - optimized Camellia and added defense against timing attacks
    - updated benchmarks code to show cycles per byte and to time key/IV setup
    - started using OpenMP for increased multi-core speed
    - enabled GCC optimization flags by default in GNUmakefile
    - added blinding and computational error checking for RW signing
    - changed RandomPool, X917RNG, GetNextIV, DSA/NR/ECDSA/ECNR to reduce
      the risk of reusing random numbers and IVs after virtual machine state
      rollback
    - changed default FIPS mode RNG from AutoSeededX917RNG<DES_EDE3> to
      AutoSeededX917RNG<AES>
    - fixed PANAMA cipher interface to accept 256-bit key and 256-bit IV
    - moved MD2, MD4, MD5, PanamaHash, ARC4, WAKE_CFB into the namespace "Weak"
    - removed HAVAL, MD5-MAC, XMAC

5.5.1 - fixed VMAC validation failure on 32-bit big-endian machines

5.5.2 - ported x64 assembly language code for AES, Salsa20, Sosemanuk, and Panama
        to MSVC 2005 (using MASM since MSVC doesn't support inline assembly on x64)
      - fixed Salsa20 initialization crash on non-SSE2 machines
      - fixed Whirlpool crash on Pentium 2 machines
      - fixed possible branch prediction analysis (BPA) vulnerability in
        MontgomeryReduce(), which may affect security of RSA, RW, LUC
      - fixed link error with MSVC 2003 when using "debug DLL" form of runtime library
      - fixed crash in SSE2_Add on P4 machines when compiled with
        MSVC 6.0 SP5 with Processor Pack
      - added support for newly released compilers: MSVC 2008, GCC 4.2, Sun CC 5.9,
        Intel C++ Compiler 10.0, and Borland C++Builder 2007

6 files changed, 33 insertions, 98 deletions

diff --git a/security/crypto++/Makefile b/security/crypto++/Makefile
index de228dc7621..8aba45ef91c 100644
--- a/security/crypto++/Makefile
+++ b/security/crypto++/Makefile
@@ -1,12 +1,10 @@
-# $NetBSD: Makefile,v 1.7 2007/02/22 19:27:07 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2007/12/01 04:17:50 rillig Exp $
 #
 
-DISTNAME=		cryptopp521
-PKGNAME=		cryptopp-5.2.1
-PKGREVISION=		1
+DISTNAME=		cryptopp552
+PKGNAME=		cryptopp-5.5.2
 CATEGORIES=		security
-MASTER_SITES=		http://www.eskimo.com/~weidai/ \
-			${MASTER_SITE_SOURCEFORGE:=cryptopp/} \
+MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=cryptopp/} \
 			http://gd.tuwien.ac.at/privacy/crypto/libs/cryptlib/ \
 			http://www.mirrors.wiretapped.net/security/cryptography/libraries/cryptolib/
 EXTRACT_SUFX=		.zip
@@ -21,19 +19,17 @@ USE_TOOLS+=		gmake
 MAKE_FILE=		GNUmakefile
 WRKSRC=			${WRKDIR}
 USE_LANGUAGES=		c++
+CPPFLAGS+=		-DCRYPTOPP_DISABLE_ASM
+BUILDLINK_TRANSFORM+=	rm:-pipe rm:-msse2
+EXTRACT_OPTS_ZIP=	-aqo
 
-INSTALLATION_DIRS=	bin lib
+INSTALLATION_DIRS_FROM_PLIST=	yes
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/cryptest ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/cryptest.exe ${PREFIX}/bin/cryptest
 	${INSTALL_DATA} ${WRKSRC}/libcryptopp.a ${PREFIX}/lib
-	${INSTALL_DATA_DIR} ${PREFIX}/include/cryptopp ${PREFIX}/share/doc/cryptopp
-
 	${INSTALL_DATA} ${WRKSRC}/Readme.txt ${PREFIX}/share/doc/cryptopp/README
 	${INSTALL_DATA} ${WRKSRC}/License.txt ${PREFIX}/share/doc/cryptopp/License
-
-	for f in ${WRKSRC}/*.h; do	\
-		${INSTALL_DATA} $$f ${PREFIX}/include/cryptopp;	\
-	done
+	cd ${WRKSRC} && ${INSTALL_DATA} *.h ${PREFIX}/include/cryptopp
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/crypto++/PLIST b/security/crypto++/PLIST
index 0212e28d82b..6f6a5b244b0 100644
--- a/security/crypto++/PLIST
+++ b/security/crypto++/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2005/03/19 16:48:21 wiz Exp $
+@comment $NetBSD: PLIST,v 1.3 2007/12/01 04:17:50 rillig Exp $
 bin/cryptest
 include/cryptopp/3way.h
 include/cryptopp/adler32.h
@@ -19,6 +19,7 @@ include/cryptopp/cast.h
 include/cryptopp/cbcmac.h
 include/cryptopp/channels.h
 include/cryptopp/config.h
+include/cryptopp/cpu.h
 include/cryptopp/crc.h
 include/cryptopp/cryptlib.h
 include/cryptopp/default.h
@@ -32,6 +33,7 @@ include/cryptopp/ec2n.h
 include/cryptopp/eccrypto.h
 include/cryptopp/ecp.h
 include/cryptopp/elgamal.h
+include/cryptopp/emsa2.h
 include/cryptopp/eprecomp.h
 include/cryptopp/esign.h
 include/cryptopp/factory.h
@@ -45,7 +47,6 @@ include/cryptopp/gf2n.h
 include/cryptopp/gfpcrypt.h
 include/cryptopp/gost.h
 include/cryptopp/gzip.h
-include/cryptopp/haval.h
 include/cryptopp/hex.h
 include/cryptopp/hmac.h
 include/cryptopp/hrtimer.h
@@ -59,7 +60,6 @@ include/cryptopp/mars.h
 include/cryptopp/md2.h
 include/cryptopp/md4.h
 include/cryptopp/md5.h
-include/cryptopp/md5mac.h
 include/cryptopp/mdc.h
 include/cryptopp/misc.h
 include/cryptopp/modarith.h
@@ -93,10 +93,12 @@ include/cryptopp/rng.h
 include/cryptopp/rsa.h
 include/cryptopp/rw.h
 include/cryptopp/safer.h
+include/cryptopp/salsa.h
 include/cryptopp/seal.h
 include/cryptopp/secblock.h
 include/cryptopp/seckey.h
 include/cryptopp/serpent.h
+include/cryptopp/serpentp.h
 include/cryptopp/sha.h
 include/cryptopp/shacal2.h
 include/cryptopp/shark.h
@@ -104,6 +106,7 @@ include/cryptopp/simple.h
 include/cryptopp/skipjack.h
 include/cryptopp/smartptr.h
 include/cryptopp/socketft.h
+include/cryptopp/sosemanuk.h
 include/cryptopp/square.h
 include/cryptopp/stdcpp.h
 include/cryptopp/strciphr.h
@@ -114,12 +117,12 @@ include/cryptopp/trunhash.h
 include/cryptopp/ttmac.h
 include/cryptopp/twofish.h
 include/cryptopp/validate.h
+include/cryptopp/vmac.h
 include/cryptopp/wait.h
 include/cryptopp/wake.h
 include/cryptopp/whrlpool.h
 include/cryptopp/winpipes.h
 include/cryptopp/words.h
-include/cryptopp/xormac.h
 include/cryptopp/xtr.h
 include/cryptopp/xtrcrypt.h
 include/cryptopp/zdeflate.h
diff --git a/security/crypto++/buildlink3.mk b/security/crypto++/buildlink3.mk
index 278c3f4fbff..4dc5333250c 100644
--- a/security/crypto++/buildlink3.mk
+++ b/security/crypto++/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:11:06 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2007/12/01 04:17:50 rillig Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 CRYPTOPP_BUILDLINK3_MK:=	${CRYPTOPP_BUILDLINK3_MK}+
@@ -15,7 +15,7 @@ BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}cryptopp
 BUILDLINK_API_DEPENDS.cryptopp+=	cryptopp>=5.1
 BUILDLINK_DEPMETHOD.cryptopp?=	build
 BUILDLINK_ABI_DEPENDS.cryptopp?=	cryptopp>=5.2.1nb1
-BUILDLINK_PKGSRCDIR.cryptopp?=	../../security/cryptopp
+BUILDLINK_PKGSRCDIR.cryptopp?=	../../security/crypto++
 .endif	# CRYPTOPP_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
diff --git a/security/crypto++/distinfo b/security/crypto++/distinfo
index 92e98c8aeb3..d52f87e94a2 100644
--- a/security/crypto++/distinfo
+++ b/security/crypto++/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.3 2005/03/19 16:48:21 wiz Exp $
+$NetBSD: distinfo,v 1.4 2007/12/01 04:17:51 rillig Exp $
 
-SHA1 (cryptopp521.zip) = 4b84311d1cbde04df5d88b5375d29c2e35ccb89c
-RMD160 (cryptopp521.zip) = 7c4d3cf702a1cf38f2a19cb5cebf170dabc23a35
-Size (cryptopp521.zip) = 1010937 bytes
-SHA1 (patch-aa) = 85d1f8323e8d0f32ebb7a3070ecbb01ae3908f00
-SHA1 (patch-ab) = 16b27d0566a162e8412db9d4f0186cc15f4c9980
+SHA1 (cryptopp552.zip) = 18efe451b3c682f40db75dc2b09cb448a835e7d6
+RMD160 (cryptopp552.zip) = 8929795b654d7186b2b38714d22a57ea01862dbd
+Size (cryptopp552.zip) = 992073 bytes
+SHA1 (patch-aa) = 777f0cec232cf696ea1a9dd04fa626f3e76442c1
diff --git a/security/crypto++/patches/patch-aa b/security/crypto++/patches/patch-aa
index b0cc8fa24ae..77bc2c1dfaa 100644
--- a/security/crypto++/patches/patch-aa
+++ b/security/crypto++/patches/patch-aa
@@ -1,60 +1,10 @@
-$NetBSD: patch-aa,v 1.2 2005/03/19 16:48:21 wiz Exp $
+$NetBSD: patch-aa,v 1.3 2007/12/01 04:17:51 rillig Exp $
 
---- GNUmakefile.orig	2004-06-20 11:22:24.000000000 +0200
-+++ GNUmakefile
-@@ -1,5 +1,5 @@
- # can't use -fno-rtti yet because it causes problems with exception handling in GCC 2.95.2
--CXXFLAGS = -g
-+#CXXFLAGS = -g
- # Uncomment the following two lines to do a release build.
- # Note that you must define NDEBUG for your own application if you define it for Crypto++.
- # Make sure you run the validation tests and test your own program thoroughly
-@@ -22,9 +22,9 @@ ifeq ($(ISX86),1)
- GCC33ORLATER = $(shell $(CXX) -v 2>&1 | grep -c "gcc version \(3.[3-9]\|[4-9]\)")
- GAS210ORLATER = $(shell echo "" | $(AS) -v 2>&1 | grep -c "GNU assembler version \(2.[1-9][0-9]\|[3-9]\)")
- 
--ifeq ($(GCC33ORLATER) $(ISMINGW),1 0)	# MINGW32 is missing the memalign function
--CXXFLAGS += -msse2
--endif
-+#ifeq ($(GCC33ORLATER) $(ISMINGW),1 0)	# MINGW32 is missing the memalign function
-+#CXXFLAGS += -msse2
-+#endif
- 
- ifeq ($(GAS210ORLATER),0)	# .intel_syntax wasn't supported until GNU assembler 2.10
- CXXFLAGS += -DCRYPTOPP_DISABLE_X86ASM
-@@ -38,14 +38,14 @@ endif
- 
- ifeq ($(UNAME),)	# for DJGPP, where uname doesn't exist
- CXXFLAGS += -mbnu210
--else
--CXXFLAGS += -pipe
-+#else
-+#CXXFLAGS += -pipe
- endif
- 
- ifeq ($(UNAME),Darwin)
- AR = libtool
- ARFLAGS = -static -o
--CXX = c++
-+#CXX = c++
- CXXFLAGS += -D__pic__
- IS_GCC2 = $(shell $(CXX) -v 2>&1 | grep -c gcc-932)
- ifeq ($(IS_GCC2),1)
-@@ -75,7 +75,7 @@ LIBIMPORTOBJS = $(LIBOBJS:.o=.import.o)
- TESTIMPORTOBJS = $(TESTOBJS:.o=.import.o)
- DLLTESTOBJS = dlltest.dllonly.o
- 
--all: cryptest.exe
-+all: cryptest
- 
- 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)
-@@ -84,7 +84,7 @@ libcryptopp.a: $(LIBOBJS)
- 	$(AR) $(ARFLAGS) $@ $(LIBOBJS)
- 	$(RANLIB) $@
- 
--cryptest.exe: libcryptopp.a $(TESTOBJS)
-+cryptest: libcryptopp.a $(TESTOBJS)
- 	$(CXX) -o $@ $(CXXFLAGS) $(TESTOBJS) -L. -lcryptopp $(LDFLAGS) $(LDLIBS)
- 
- nolib: $(OBJS)		# makes it faster to test changes
+--- GNUmakefile.orig	2007-09-23 21:03:14.000000000 +0200
++++ GNUmakefile	2007-12-01 03:40:46.000000000 +0100
+@@ -1,4 +1,4 @@
+-CXXFLAGS = -DNDEBUG -g -O2
++CXXFLAGS = $(CPPFLAGS) -DNDEBUG -g -O2
+ # the following options reduce code size, but breaks link or makes link very slow on some systems
+ # CXXFLAGS += -ffunction-sections -fdata-sections
+ # LDFLAGS += -Wl,--gc-sections
diff --git a/security/crypto++/patches/patch-ab b/security/crypto++/patches/patch-ab
deleted file mode 100644
index 3e2c0691479..00000000000
--- a/security/crypto++/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2005/03/19 16:48:21 wiz Exp $
-
---- config.h.orig	2004-07-21 19:09:46.000000000 +0200
-+++ config.h
-@@ -201,7 +201,7 @@ NAMESPACE_END
- #define CRYPTOPP_WIN32_AVAILABLE
- #endif
- 
--#if defined(__unix__) || defined(__MACH__)
-+#if defined(__unix__) || defined(__MACH__) || defined(__NetBSD__)
- #define CRYPTOPP_UNIX_AVAILABLE
- #endif
-