summaryrefslogtreecommitdiff
path: root/security
diff options
context:
space:
mode:
Diffstat (limited to 'security')
-rw-r--r--security/crypto++/Makefile6
-rw-r--r--security/crypto++/PLIST9
-rw-r--r--security/crypto++/buildlink3.mk6
-rw-r--r--security/crypto++/distinfo18
-rw-r--r--security/crypto++/patches/patch-aa12
-rw-r--r--security/crypto++/patches/patch-algebra.cpp13
-rw-r--r--security/crypto++/patches/patch-cryptlib.cpp13
-rw-r--r--security/crypto++/patches/patch-cryptlib.h13
-rw-r--r--security/crypto++/patches/patch-eccrypto.cpp31
-rw-r--r--security/crypto++/patches/patch-eccrypto.h37
-rw-r--r--security/crypto++/patches/patch-panama.cpp13
-rw-r--r--security/crypto++/patches/patch-secblock.h13
-rw-r--r--security/crypto++/patches/patch-simple.h13
13 files changed, 25 insertions, 172 deletions
diff --git a/security/crypto++/Makefile b/security/crypto++/Makefile
index 795420a1404..6c649f7869d 100644
--- a/security/crypto++/Makefile
+++ b/security/crypto++/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2013/04/08 11:17:20 rodent Exp $
+# $NetBSD: Makefile,v 1.15 2013/06/12 12:00:08 ryoon Exp $
#
-DISTNAME= cryptopp552
-PKGNAME= cryptopp-5.5.2
+DISTNAME= cryptopp562
+PKGNAME= cryptopp-5.6.2
CATEGORIES= security
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=cryptopp/}
EXTRACT_SUFX= .zip
diff --git a/security/crypto++/PLIST b/security/crypto++/PLIST
index d922ad7d00a..bf0c2c983e8 100644
--- a/security/crypto++/PLIST
+++ b/security/crypto++/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2009/06/14 18:13:27 joerg Exp $
+@comment $NetBSD: PLIST,v 1.5 2013/06/12 12:00:08 ryoon Exp $
bin/cryptest
include/cryptopp/3way.h
include/cryptopp/adler32.h
@@ -8,6 +8,7 @@ include/cryptopp/algparam.h
include/cryptopp/arc4.h
include/cryptopp/argnames.h
include/cryptopp/asn.h
+include/cryptopp/authenc.h
include/cryptopp/base32.h
include/cryptopp/base64.h
include/cryptopp/basecode.h
@@ -17,7 +18,9 @@ include/cryptopp/blumshub.h
include/cryptopp/camellia.h
include/cryptopp/cast.h
include/cryptopp/cbcmac.h
+include/cryptopp/ccm.h
include/cryptopp/channels.h
+include/cryptopp/cmac.h
include/cryptopp/config.h
include/cryptopp/cpu.h
include/cryptopp/crc.h
@@ -29,6 +32,7 @@ include/cryptopp/dh2.h
include/cryptopp/dll.h
include/cryptopp/dmac.h
include/cryptopp/dsa.h
+include/cryptopp/eax.h
include/cryptopp/ec2n.h
include/cryptopp/eccrypto.h
include/cryptopp/ecp.h
@@ -41,6 +45,7 @@ include/cryptopp/files.h
include/cryptopp/filters.h
include/cryptopp/fips140.h
include/cryptopp/fltrimpl.h
+include/cryptopp/gcm.h
include/cryptopp/gf256.h
include/cryptopp/gf2_32.h
include/cryptopp/gf2n.h
@@ -97,9 +102,11 @@ include/cryptopp/salsa.h
include/cryptopp/seal.h
include/cryptopp/secblock.h
include/cryptopp/seckey.h
+include/cryptopp/seed.h
include/cryptopp/serpent.h
include/cryptopp/serpentp.h
include/cryptopp/sha.h
+include/cryptopp/sha3.h
include/cryptopp/shacal2.h
include/cryptopp/shark.h
include/cryptopp/simple.h
diff --git a/security/crypto++/buildlink3.mk b/security/crypto++/buildlink3.mk
index 5e40e88e431..ecfdf97fb11 100644
--- a/security/crypto++/buildlink3.mk
+++ b/security/crypto++/buildlink3.mk
@@ -1,13 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.10 2012/05/07 01:53:55 dholland Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2013/06/12 12:00:08 ryoon Exp $
BUILDLINK_TREE+= cryptopp
.if !defined(CRYPTOPP_BUILDLINK3_MK)
CRYPTOPP_BUILDLINK3_MK:=
-BUILDLINK_API_DEPENDS.cryptopp+= cryptopp>=5.1
+BUILDLINK_API_DEPENDS.cryptopp+= cryptopp>=5.6.2
BUILDLINK_DEPMETHOD.cryptopp?= build
-BUILDLINK_ABI_DEPENDS.cryptopp+= cryptopp>=5.2.1nb1
+BUILDLINK_ABI_DEPENDS.cryptopp+= cryptopp>=5.6.2
BUILDLINK_PKGSRCDIR.cryptopp?= ../../security/crypto++
.endif # CRYPTOPP_BUILDLINK3_MK
diff --git a/security/crypto++/distinfo b/security/crypto++/distinfo
index 1f1715e7b12..bef54cf4d84 100644
--- a/security/crypto++/distinfo
+++ b/security/crypto++/distinfo
@@ -1,14 +1,6 @@
-$NetBSD: distinfo,v 1.6 2012/12/22 02:29:36 joerg Exp $
+$NetBSD: distinfo,v 1.7 2013/06/12 12:00:08 ryoon Exp $
-SHA1 (cryptopp552.zip) = 18efe451b3c682f40db75dc2b09cb448a835e7d6
-RMD160 (cryptopp552.zip) = 8929795b654d7186b2b38714d22a57ea01862dbd
-Size (cryptopp552.zip) = 992073 bytes
-SHA1 (patch-aa) = 777f0cec232cf696ea1a9dd04fa626f3e76442c1
-SHA1 (patch-algebra.cpp) = c2f915338c8fff332611d060a0fa38e1410c9e68
-SHA1 (patch-cryptlib.cpp) = 870d877c49e2e166046ede37855451c7094b5bb4
-SHA1 (patch-cryptlib.h) = 805d0404695f8ccde13eeeaf6a638f3611ef6650
-SHA1 (patch-eccrypto.cpp) = 5a35804b58b99d0d811e92f01c2350a6723443e1
-SHA1 (patch-eccrypto.h) = 8d2fe42a1cc1b4731fcd821b0b3a8a6ee59b1a32
-SHA1 (patch-panama.cpp) = 483b7153d3b5433b34981d7eb4895e37c7d9a1b7
-SHA1 (patch-secblock.h) = 5e0e3c5b48424e4232a88efc2244a9bd5df0fc5a
-SHA1 (patch-simple.h) = 1a268509a6bc96dcaa61e83cc2fcb7ed1f7eb180
+SHA1 (cryptopp562.zip) = ddc18ae41c2c940317cd6efe81871686846fa293
+RMD160 (cryptopp562.zip) = b41af768b3a5ba927dac44ec554dc2095e21b1bb
+Size (cryptopp562.zip) = 1137964 bytes
+SHA1 (patch-aa) = 99569a955773758526969c9893dfbb08aacfdc4d
diff --git a/security/crypto++/patches/patch-aa b/security/crypto++/patches/patch-aa
index 77bc2c1dfaa..3d9349c2408 100644
--- a/security/crypto++/patches/patch-aa
+++ b/security/crypto++/patches/patch-aa
@@ -1,10 +1,10 @@
-$NetBSD: patch-aa,v 1.3 2007/12/01 04:17:51 rillig Exp $
+$NetBSD: patch-aa,v 1.4 2013/06/12 12:00:08 ryoon Exp $
---- GNUmakefile.orig 2007-09-23 21:03:14.000000000 +0200
-+++ GNUmakefile 2007-12-01 03:40:46.000000000 +0100
+--- GNUmakefile.orig 2013-02-20 06:30:52.000000000 +0000
++++ GNUmakefile
@@ -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
+ # -O3 fails to link on Cygwin GCC version 4.5.3
+ # -fPIC is supported. Please report any breakage of -fPIC as a bug.
+ # CXXFLAGS += -fPIC
diff --git a/security/crypto++/patches/patch-algebra.cpp b/security/crypto++/patches/patch-algebra.cpp
deleted file mode 100644
index d980a987c07..00000000000
--- a/security/crypto++/patches/patch-algebra.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-algebra.cpp,v 1.1 2012/12/22 02:29:36 joerg Exp $
-
---- algebra.cpp.orig 2012-12-21 21:43:47.000000000 +0000
-+++ algebra.cpp
-@@ -58,7 +58,7 @@ template <class T> const T& AbstractEucl
- 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;
diff --git a/security/crypto++/patches/patch-cryptlib.cpp b/security/crypto++/patches/patch-cryptlib.cpp
deleted file mode 100644
index db75e550cb0..00000000000
--- a/security/crypto++/patches/patch-cryptlib.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-cryptlib.cpp,v 1.1 2012/12/22 02:29:36 joerg Exp $
-
---- cryptlib.cpp.orig 2012-12-21 21:38:50.000000000 +0000
-+++ cryptlib.cpp
-@@ -29,7 +29,7 @@ CRYPTOPP_COMPILE_ASSERT(sizeof(dword) ==
- #endif
-
- const std::string BufferedTransformation::NULL_CHANNEL;
--const NullNameValuePairs g_nullNameValuePairs;
-+NullNameValuePairs g_nullNameValuePairs;
-
- BufferedTransformation & TheBitBucket()
- {
diff --git a/security/crypto++/patches/patch-cryptlib.h b/security/crypto++/patches/patch-cryptlib.h
deleted file mode 100644
index 1f3d5de6b28..00000000000
--- a/security/crypto++/patches/patch-cryptlib.h
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-cryptlib.h,v 1.1 2012/12/22 02:29:36 joerg Exp $
-
---- cryptlib.h.orig 2012-12-21 21:38:45.000000000 +0000
-+++ cryptlib.h
-@@ -323,7 +323,7 @@ public:
- };
-
- //! _
--extern CRYPTOPP_DLL const NullNameValuePairs g_nullNameValuePairs;
-+extern CRYPTOPP_DLL NullNameValuePairs g_nullNameValuePairs;
-
- // ********************************************************
-
diff --git a/security/crypto++/patches/patch-eccrypto.cpp b/security/crypto++/patches/patch-eccrypto.cpp
deleted file mode 100644
index 5b78e887896..00000000000
--- a/security/crypto++/patches/patch-eccrypto.cpp
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-eccrypto.cpp,v 1.1 2012/12/22 02:29:36 joerg Exp $
-
---- eccrypto.cpp.orig 2012-12-21 21:44:36.000000000 +0000
-+++ eccrypto.cpp
-@@ -389,7 +389,7 @@ template <class EC> void DL_GroupParamet
- 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);
-@@ -545,7 +545,7 @@ bool DL_GroupParameters_EC<EC>::Validate
- 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;
-@@ -583,7 +583,7 @@ void DL_PublicKey_EC<EC>::BERDecodePubli
- typename EC::Point P;
- if (!this->GetGroupParameters().GetCurve().DecodePoint(P, bt, size))
- BERDecodeError();
-- SetPublicElement(P);
-+ this->SetPublicElement(P);
- }
-
- template <class EC>
diff --git a/security/crypto++/patches/patch-eccrypto.h b/security/crypto++/patches/patch-eccrypto.h
deleted file mode 100644
index e8eb8326fab..00000000000
--- a/security/crypto++/patches/patch-eccrypto.h
+++ /dev/null
@@ -1,37 +0,0 @@
-$NetBSD: patch-eccrypto.h,v 1.1 2012/12/22 02:29:36 joerg Exp $
-
---- eccrypto.h.orig 2012-12-21 21:44:16.000000000 +0000
-+++ 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/security/crypto++/patches/patch-panama.cpp b/security/crypto++/patches/patch-panama.cpp
deleted file mode 100644
index 219bbe75bed..00000000000
--- a/security/crypto++/patches/patch-panama.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-panama.cpp,v 1.1 2012/04/17 17:46:31 joerg Exp $
-
---- panama.cpp.orig 2012-04-17 15:42:03.000000000 +0000
-+++ panama.cpp
-@@ -420,7 +420,7 @@ void PanamaHash<B>::TruncatedFinal(byte
- {
- this->ThrowIfInvalidTruncatedSize(size);
-
-- PadLastBlock(this->BLOCKSIZE, 0x01);
-+ this->PadLastBlock(this->BLOCKSIZE, 0x01);
-
- HashEndianCorrectedBlock(this->m_data);
-
diff --git a/security/crypto++/patches/patch-secblock.h b/security/crypto++/patches/patch-secblock.h
deleted file mode 100644
index 2656384f340..00000000000
--- a/security/crypto++/patches/patch-secblock.h
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-secblock.h,v 1.1 2012/04/17 17:46:31 joerg Exp $
-
---- secblock.h.orig 2012-04-17 15:36:29.000000000 +0000
-+++ secblock.h
-@@ -94,7 +94,7 @@ public:
-
- pointer allocate(size_type n, const void * = NULL)
- {
-- CheckSize(n);
-+ this->CheckSize(n);
- if (n == 0)
- return NULL;
-
diff --git a/security/crypto++/patches/patch-simple.h b/security/crypto++/patches/patch-simple.h
deleted file mode 100644
index fcfd275a2f9..00000000000
--- a/security/crypto++/patches/patch-simple.h
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-simple.h,v 1.1 2012/04/17 17:46:31 joerg Exp $
-
---- simple.h.orig 2012-04-17 15:39:30.000000000 +0000
-+++ simple.h
-@@ -125,7 +125,7 @@ public:
- bool Flush(bool hardFlush, int propagation=-1, bool blocking=true)
- {return ChannelFlush(this->NULL_CHANNEL, hardFlush, propagation, blocking);}
- bool MessageSeriesEnd(int propagation=-1, bool blocking=true)
-- {return ChannelMessageSeriesEnd(this->NULL_CHANNEL, propagation, blocking);}
-+ {return this->ChannelMessageSeriesEnd(this->NULL_CHANNEL, propagation, blocking);}
- byte * CreatePutSpace(size_t &size)
- {return ChannelCreatePutSpace(this->NULL_CHANNEL, size);}
- size_t Put2(const byte *begin, size_t length, int messageEnd, bool blocking)
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-19 12:38:23 +0000