arne
/
cryptopp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Cleared auto_ptr deprecation warning with C++11 under Debian 8/i686

pull/35/head
Jeffrey Walton 2015-07-30 12:07:26 -04:00
parent a8ca289b00
commit 7ad12ab5b0
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
cryptlib.cpp
View File

@ -761,13 +761,15 @@ BufferedTransformation * PK_Decryptor::CreateDecryptionFilter(RandomNumberGenera
size_t PK_Signer::Sign(RandomNumberGenerator &rng, PK_MessageAccumulator *messageAccumulator, byte *signature) const size_t PK_Signer::Sign(RandomNumberGenerator &rng, PK_MessageAccumulator *messageAccumulator, byte *signature) const
{ {
std::auto_ptr<PK_MessageAccumulator> m(messageAccumulator); using CryptoPP::auto_ptr;
auto_ptr<PK_MessageAccumulator> m(messageAccumulator);
return SignAndRestart(rng, *m, signature, false); return SignAndRestart(rng, *m, signature, false);
} }
size_t PK_Signer::SignMessage(RandomNumberGenerator &rng, const byte *message, size_t messageLen, byte *signature) const size_t PK_Signer::SignMessage(RandomNumberGenerator &rng, const byte *message, size_t messageLen, byte *signature) const
{ {
std::auto_ptr<PK_MessageAccumulator> m(NewSignatureAccumulator(rng)); using CryptoPP::auto_ptr;
auto_ptr<PK_MessageAccumulator> m(NewSignatureAccumulator(rng));
m->Update(message, messageLen); m->Update(message, messageLen);
return SignAndRestart(rng, *m, signature, false); return SignAndRestart(rng, *m, signature, false);
} }
@ -775,7 +777,8 @@ size_t PK_Signer::SignMessage(RandomNumberGenerator &rng, const byte *message, s
size_t PK_Signer::SignMessageWithRecovery(RandomNumberGenerator &rng, const byte *recoverableMessage, size_t recoverableMessageLength, size_t PK_Signer::SignMessageWithRecovery(RandomNumberGenerator &rng, const byte *recoverableMessage, size_t recoverableMessageLength,
const byte *nonrecoverableMessage, size_t nonrecoverableMessageLength, byte *signature) const const byte *nonrecoverableMessage, size_t nonrecoverableMessageLength, byte *signature) const
{ {
std::auto_ptr<PK_MessageAccumulator> m(NewSignatureAccumulator(rng)); using CryptoPP::auto_ptr;
auto_ptr<PK_MessageAccumulator> m(NewSignatureAccumulator(rng));
InputRecoverableMessage(*m, recoverableMessage, recoverableMessageLength); InputRecoverableMessage(*m, recoverableMessage, recoverableMessageLength);
m->Update(nonrecoverableMessage, nonrecoverableMessageLength); m->Update(nonrecoverableMessage, nonrecoverableMessageLength);
return SignAndRestart(rng, *m, signature, false); return SignAndRestart(rng, *m, signature, false);
@ -783,13 +786,15 @@ size_t PK_Signer::SignMessageWithRecovery(RandomNumberGenerator &rng, const byte
bool PK_Verifier::Verify(PK_MessageAccumulator *messageAccumulator) const bool PK_Verifier::Verify(PK_MessageAccumulator *messageAccumulator) const
{ {
std::auto_ptr<PK_MessageAccumulator> m(messageAccumulator); using CryptoPP::auto_ptr;
auto_ptr<PK_MessageAccumulator> m(messageAccumulator);
return VerifyAndRestart(*m); return VerifyAndRestart(*m);
} }
bool PK_Verifier::VerifyMessage(const byte *message, size_t messageLen, const byte *signature, size_t signatureLength) const bool PK_Verifier::VerifyMessage(const byte *message, size_t messageLen, const byte *signature, size_t signatureLength) const
{ {
std::auto_ptr<PK_MessageAccumulator> m(NewVerificationAccumulator()); using CryptoPP::auto_ptr;
auto_ptr<PK_MessageAccumulator> m(NewVerificationAccumulator());
InputSignature(*m, signature, signatureLength); InputSignature(*m, signature, signatureLength);
m->Update(message, messageLen); m->Update(message, messageLen);
return VerifyAndRestart(*m); return VerifyAndRestart(*m);
@ -797,7 +802,8 @@ bool PK_Verifier::VerifyMessage(const byte *message, size_t messageLen, const by
DecodingResult PK_Verifier::Recover(byte *recoveredMessage, PK_MessageAccumulator *messageAccumulator) const DecodingResult PK_Verifier::Recover(byte *recoveredMessage, PK_MessageAccumulator *messageAccumulator) const
{ {
std::auto_ptr<PK_MessageAccumulator> m(messageAccumulator); using CryptoPP::auto_ptr;
auto_ptr<PK_MessageAccumulator> m(messageAccumulator);
return RecoverAndRestart(recoveredMessage, *m); return RecoverAndRestart(recoveredMessage, *m);
} }
@ -805,7 +811,8 @@ DecodingResult PK_Verifier::RecoverMessage(byte *recoveredMessage,
const byte *nonrecoverableMessage, size_t nonrecoverableMessageLength, const byte *nonrecoverableMessage, size_t nonrecoverableMessageLength,
const byte *signature, size_t signatureLength) const const byte *signature, size_t signatureLength) const
{ {
std::auto_ptr<PK_MessageAccumulator> m(NewVerificationAccumulator()); using CryptoPP::auto_ptr;
auto_ptr<PK_MessageAccumulator> m(NewVerificationAccumulator());
InputSignature(*m, signature, signatureLength); InputSignature(*m, signature, signatureLength);
m->Update(nonrecoverableMessage, nonrecoverableMessageLength); m->Update(nonrecoverableMessage, nonrecoverableMessageLength);
return RecoverAndRestart(recoveredMessage, *m); return RecoverAndRestart(recoveredMessage, *m);