From c137edc6f34b8c5cf189173f0f8f80b738ed204b Mon Sep 17 00:00:00 2001 From: weidai Date: Tue, 22 Apr 2003 00:12:41 +0000 Subject: [PATCH] remove default NullRNG() for signing --- cryptlib.h | 2 +- filters.cpp | 4 ++-- filters.h | 2 +- pubkey.h | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/cryptlib.h b/cryptlib.h index 31e32e8f..bdb281d3 100644 --- a/cryptlib.h +++ b/cryptlib.h @@ -1258,7 +1258,7 @@ class PK_Signer : virtual public PK_SignatureScheme, public PrivateKeyAlgorithm { public: //! create a new HashTransformation to accumulate the message to be signed - virtual PK_MessageAccumulator * NewSignatureAccumulator(RandomNumberGenerator &rng = NullRNG()) const =0; + virtual PK_MessageAccumulator * NewSignatureAccumulator(RandomNumberGenerator &rng) const =0; virtual void InputRecoverableMessage(PK_MessageAccumulator &messageAccumulator, const byte *recoverableMessage, unsigned int recoverableMessageLength) const =0; diff --git a/filters.cpp b/filters.cpp index 4c4d6600..47b5c93e 100644 --- a/filters.cpp +++ b/filters.cpp @@ -707,7 +707,7 @@ void HashVerificationFilter::LastPut(const byte *inString, unsigned int length) void SignerFilter::IsolatedInitialize(const NameValuePairs ¶meters) { m_putMessage = parameters.GetValueWithDefault(Name::PutMessage(), false); - m_messageAccumulator.reset(m_signer.NewSignatureAccumulator()); + m_messageAccumulator.reset(m_signer.NewSignatureAccumulator(m_rng)); } unsigned int SignerFilter::Put2(const byte *inString, unsigned int length, int messageEnd, bool blocking) @@ -721,7 +721,7 @@ unsigned int SignerFilter::Put2(const byte *inString, unsigned int length, int m m_buf.New(m_signer.SignatureLength()); m_signer.Sign(m_rng, m_messageAccumulator.release(), m_buf); FILTER_OUTPUT(2, m_buf, m_buf.size(), messageEnd); - m_messageAccumulator.reset(m_signer.NewSignatureAccumulator()); + m_messageAccumulator.reset(m_signer.NewSignatureAccumulator(m_rng)); } FILTER_END_NO_MESSAGE_END; } diff --git a/filters.h b/filters.h index c5d8641e..85666574 100644 --- a/filters.h +++ b/filters.h @@ -317,7 +317,7 @@ class SignerFilter : public Unflushable { public: SignerFilter(RandomNumberGenerator &rng, const PK_Signer &signer, BufferedTransformation *attachment = NULL, bool putMessage=false) - : Unflushable(attachment), m_rng(rng), m_signer(signer), m_messageAccumulator(signer.NewSignatureAccumulator()), m_putMessage(putMessage) {} + : Unflushable(attachment), m_rng(rng), m_signer(signer), m_messageAccumulator(signer.NewSignatureAccumulator(rng)), m_putMessage(putMessage) {} void IsolatedInitialize(const NameValuePairs ¶meters); unsigned int Put2(const byte *begin, unsigned int length, int messageEnd, bool blocking); diff --git a/pubkey.h b/pubkey.h index a5fb704e..4899f533 100644 --- a/pubkey.h +++ b/pubkey.h @@ -474,7 +474,7 @@ class TF_EncryptorImpl : public TF_PublicObjectImpl class TF_SignerImpl : public TF_PrivateObjectImpl { - PK_MessageAccumulator * NewSignatureAccumulator(RandomNumberGenerator &rng = NullRNG()) const + PK_MessageAccumulator * NewSignatureAccumulator(RandomNumberGenerator &rng) const { return new PK_MessageAccumulatorImpl; } @@ -1366,7 +1366,7 @@ public: template class DL_SignerImpl : public DL_PrivateObjectImpl, SCHEME_OPTIONS> { - PK_MessageAccumulator * NewSignatureAccumulator(RandomNumberGenerator &rng = NullRNG()) const + PK_MessageAccumulator * NewSignatureAccumulator(RandomNumberGenerator &rng) const { std::auto_ptr p(new PK_MessageAccumulatorImpl); RestartMessageAccumulator(rng, *p);