Tue Apr 17 17:46:31 2012 UTC ()
Fix some errors in C++ usage.
(joerg)
diff -r1.4 -r1.5 pkgsrc/security/crypto++/distinfo
diff -r0 -r1.1 pkgsrc/security/crypto++/patches/patch-panama.cpp
diff -r0 -r1.1 pkgsrc/security/crypto++/patches/patch-secblock.h
diff -r0 -r1.1 pkgsrc/security/crypto++/patches/patch-simple.h
--- pkgsrc/security/crypto++/distinfo 2007/12/01 04:17:51 1.4
+++ pkgsrc/security/crypto++/distinfo 2012/04/17 17:46:30 1.5
| @@ -1,6 +1,9 @@ | | | @@ -1,6 +1,9 @@ |
| 1 | $NetBSD: distinfo,v 1.4 2007/12/01 04:17:51 rillig Exp $ | | 1 | $NetBSD: distinfo,v 1.5 2012/04/17 17:46:30 joerg Exp $ |
| 2 | | | 2 | |
| 3 | SHA1 (cryptopp552.zip) = 18efe451b3c682f40db75dc2b09cb448a835e7d6 | | 3 | SHA1 (cryptopp552.zip) = 18efe451b3c682f40db75dc2b09cb448a835e7d6 |
| 4 | RMD160 (cryptopp552.zip) = 8929795b654d7186b2b38714d22a57ea01862dbd | | 4 | RMD160 (cryptopp552.zip) = 8929795b654d7186b2b38714d22a57ea01862dbd |
| 5 | Size (cryptopp552.zip) = 992073 bytes | | 5 | Size (cryptopp552.zip) = 992073 bytes |
| 6 | SHA1 (patch-aa) = 777f0cec232cf696ea1a9dd04fa626f3e76442c1 | | 6 | SHA1 (patch-aa) = 777f0cec232cf696ea1a9dd04fa626f3e76442c1 |
| | | 7 | SHA1 (patch-panama.cpp) = 483b7153d3b5433b34981d7eb4895e37c7d9a1b7 |
| | | 8 | SHA1 (patch-secblock.h) = 5e0e3c5b48424e4232a88efc2244a9bd5df0fc5a |
| | | 9 | SHA1 (patch-simple.h) = 1a268509a6bc96dcaa61e83cc2fcb7ed1f7eb180 |
$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);
$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;
$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)