Update to 5.2.1. Provided by Stefan Krüger in PR 28740.

5.2 - merged in changes for 5.01 - 5.0.4
    - added support for using encoding parameters and key derivation parameters
      with public key encryption (implemented by OAEP and DL/ECIES)
    - added Camellia, SHACAL-2, Two-Track-MAC, Whirlpool, RIPEMD-320,
      RIPEMD-128, RIPEMD-256, Base-32 coding
    - added ThreadUserTimer for timing thread CPU usage
    - added option for password-based key derivation functions
      to iterate until a mimimum elapsed thread CPU time is reached
    - added option (on by default) for DEFLATE compression to detect
      uncompressible files and process them more quickly
    - improved compatibility and performance on 64-bit platforms,
      including Alpha, IA-64, x86-64, PPC64, Sparc64, and MIPS64
    - fixed ONE_AND_ZEROS_PADDING to use 0x80 instead 0x01 as padding.
    - fixed encoding/decoding of PKCS #8 privateKeyInfo to properly
      handle optional attributes

5.2.1 - fixed bug in the "dlltest" DLL testing program
      - fixed compiling with STLport using VC .NET
      - fixed compiling with -fPIC using GCC
      - fixed compiling with -msse2 on systems without memalign()
      - fixed inability to instantiate PanamaMAC
      - fixed problems with inline documentation

6 files changed, 73 insertions, 35 deletions

diff --git a/security/crypto++/Makefile b/security/crypto++/Makefile
index ebc2df1785f..2d325d9ede9 100644
--- a/security/crypto++/Makefile
+++ b/security/crypto++/Makefile
@@ -1,12 +1,13 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/07/26 15:18:44 minskim Exp $
+# $NetBSD: Makefile,v 1.2 2005/03/19 16:48:21 wiz Exp $
 #
 
-DISTNAME=		crypto51
-PKGNAME=		crypto++-5.1
+DISTNAME=		cryptopp521
+PKGNAME=		cryptopp-5.2.1
 CATEGORIES=		security
 MASTER_SITES=		http://www.eskimo.com/~weidai/ \
-			http://prdownloads.sourceforge.net/cryptopp/ \
-			http://gd.tuwien.ac.at/privacy/crypto/libs/cryptlib/
+			${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
 
 MAINTAINER=		tech-pkg@NetBSD.org
diff --git a/security/crypto++/PLIST b/security/crypto++/PLIST
index 6414bccd14a..0212e28d82b 100644
--- a/security/crypto++/PLIST
+++ b/security/crypto++/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/07/26 15:18:44 minskim Exp $
+@comment $NetBSD: PLIST,v 1.2 2005/03/19 16:48:21 wiz Exp $
 bin/cryptest
 include/cryptopp/3way.h
 include/cryptopp/adler32.h
@@ -8,11 +8,13 @@ include/cryptopp/algparam.h
 include/cryptopp/arc4.h
 include/cryptopp/argnames.h
 include/cryptopp/asn.h
+include/cryptopp/base32.h
 include/cryptopp/base64.h
 include/cryptopp/basecode.h
 include/cryptopp/bench.h
 include/cryptopp/blowfish.h
 include/cryptopp/blumshub.h
+include/cryptopp/camellia.h
 include/cryptopp/cast.h
 include/cryptopp/cbcmac.h
 include/cryptopp/channels.h
@@ -23,7 +25,7 @@ include/cryptopp/default.h
 include/cryptopp/des.h
 include/cryptopp/dh.h
 include/cryptopp/dh2.h
-include/cryptopp/diamond.h
+include/cryptopp/dll.h
 include/cryptopp/dmac.h
 include/cryptopp/dsa.h
 include/cryptopp/ec2n.h
@@ -84,6 +86,7 @@ include/cryptopp/randpool.h
 include/cryptopp/rc2.h
 include/cryptopp/rc5.h
 include/cryptopp/rc6.h
+include/cryptopp/resource.h
 include/cryptopp/rijndael.h
 include/cryptopp/ripemd.h
 include/cryptopp/rng.h
@@ -95,21 +98,25 @@ include/cryptopp/secblock.h
 include/cryptopp/seckey.h
 include/cryptopp/serpent.h
 include/cryptopp/sha.h
+include/cryptopp/shacal2.h
 include/cryptopp/shark.h
 include/cryptopp/simple.h
 include/cryptopp/skipjack.h
 include/cryptopp/smartptr.h
 include/cryptopp/socketft.h
 include/cryptopp/square.h
+include/cryptopp/stdcpp.h
 include/cryptopp/strciphr.h
 include/cryptopp/tea.h
 include/cryptopp/tiger.h
 include/cryptopp/trdlocal.h
 include/cryptopp/trunhash.h
+include/cryptopp/ttmac.h
 include/cryptopp/twofish.h
 include/cryptopp/validate.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
diff --git a/security/crypto++/buildlink3.mk b/security/crypto++/buildlink3.mk
index ebd0abd0d3c..f77b96a0a2d 100644
--- a/security/crypto++/buildlink3.mk
+++ b/security/crypto++/buildlink3.mk
@@ -1,7 +1,7 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2004/07/26 15:18:44 minskim Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2005/03/19 16:48:21 wiz Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-CRYPTO++_BUILDLINK3_MK:=	${CRYPTO++_BUILDLINK3_MK}+
+CRYPTOPP_BUILDLINK3_MK:=	${CRYPTOPP_BUILDLINK3_MK}+
 
 .if !empty(BUILDLINK_DEPTH:M+)
 BUILDLINK_DEPENDS+=	cryptopp
@@ -10,10 +10,10 @@ BUILDLINK_DEPENDS+=	cryptopp
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ncryptopp}
 BUILDLINK_PACKAGES+=	cryptopp
 
-.if !empty(CRYPTO++_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.cryptopp+=	crypto++>=5.1
+.if !empty(CRYPTOPP_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.cryptopp+=	cryptopp>=5.1
 BUILDLINK_DEPMETHOD.cryptopp?=	build
-BUILDLINK_PKGSRCDIR.cryptopp?=	../../wip/cryptopp
-.endif	# CRYPTO++_BUILDLINK3_MK
+BUILDLINK_PKGSRCDIR.cryptopp?=	../../security/cryptopp
+.endif	# CRYPTOPP_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/security/crypto++/distinfo b/security/crypto++/distinfo
index 1740b0e8eae..92e98c8aeb3 100644
--- a/security/crypto++/distinfo
+++ b/security/crypto++/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.2 2005/02/24 13:10:05 agc Exp $
+$NetBSD: distinfo,v 1.3 2005/03/19 16:48:21 wiz Exp $
 
-SHA1 (crypto51.zip) = 95905714c85f6fb563e66edb5478818df787fe2d
-RMD160 (crypto51.zip) = 8b7420c421be39e9976f1ce2a80840d7ed6b38ef
-Size (crypto51.zip) = 829560 bytes
-SHA1 (patch-aa) = f66abaac76ea6db3f94a8d3616114b7d893d8793
-SHA1 (patch-ab) = e9ec34d4dd5093c021cc27ea6233e87dc6262221
+SHA1 (cryptopp521.zip) = 4b84311d1cbde04df5d88b5375d29c2e35ccb89c
+RMD160 (cryptopp521.zip) = 7c4d3cf702a1cf38f2a19cb5cebf170dabc23a35
+Size (cryptopp521.zip) = 1010937 bytes
+SHA1 (patch-aa) = 85d1f8323e8d0f32ebb7a3070ecbb01ae3908f00
+SHA1 (patch-ab) = 16b27d0566a162e8412db9d4f0186cc15f4c9980
diff --git a/security/crypto++/patches/patch-aa b/security/crypto++/patches/patch-aa
index 7f799015a7d..b0cc8fa24ae 100644
--- a/security/crypto++/patches/patch-aa
+++ b/security/crypto++/patches/patch-aa
@@ -1,26 +1,55 @@
-$NetBSD: patch-aa,v 1.1.1.1 2004/07/26 15:18:44 minskim Exp $
+$NetBSD: patch-aa,v 1.2 2005/03/19 16:48:21 wiz Exp $
 
---- GNUmakefile.orig	2003-03-19 19:24:11.000000000 -0600
+--- 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 = ${CFLAGS}
- # Uncomment the next two lines to do a release build.
++#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++.
- # Also, make sure you run the validation tests and test your own program thoroughly
-@@ -47,16 +47,16 @@ OBJS = $(SRCS:.cpp=.o)
- TESTOBJS = bench.o test.o validat1.o validat2.o validat3.o adhoc.o datatest.o regtest.o
- LIBOBJS = $(filter-out $(TESTOBJS),$(OBJS))
+ # 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)
-+	$(RM) cryptest libcryptopp.a $(LIBOBJS) $(TESTOBJS)
- 
- libcryptopp.a: $(LIBOBJS)
+ 	$(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) $@
  
diff --git a/security/crypto++/patches/patch-ab b/security/crypto++/patches/patch-ab
index 2d862da732e..3e2c0691479 100644
--- a/security/crypto++/patches/patch-ab
+++ b/security/crypto++/patches/patch-ab
@@ -1,7 +1,8 @@
-$NetBSD: patch-ab,v 1.1.1.1 2004/07/26 15:18:44 minskim Exp $
---- config.h.orig	2004-04-14 01:13:37.000000000 +0100
-+++ config.h	2004-04-14 01:13:41.000000000 +0100
-@@ -194,7 +194,7 @@
+$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