InternalMessageDigestImpl: Code cleanup

pull/131/merge
Tatsuhiro Tsujikawa 2013-09-25 23:57:03 +09:00
parent 77b7747ca8
commit 7dc5567cad
2 changed files with 14 additions and 9 deletions

View File

@ -50,21 +50,25 @@ template<size_t dlen,
class MessageDigestBase : public MessageDigestImpl { class MessageDigestBase : public MessageDigestImpl {
public: public:
MessageDigestBase() { reset(); } MessageDigestBase() { reset(); }
virtual ~MessageDigestBase() { virtual ~MessageDigestBase()
{
free_fn(&ctx_); free_fn(&ctx_);
} }
static size_t length() { static size_t length()
{
return dlen; return dlen;
} }
virtual size_t getDigestLength() const CXX11_OVERRIDE { virtual size_t getDigestLength() const CXX11_OVERRIDE
{
return dlen; return dlen;
} }
virtual void reset() CXX11_OVERRIDE { virtual void reset() CXX11_OVERRIDE
printf("hash-%d\n", dlen); {
init_fn(&ctx_); init_fn(&ctx_);
} }
virtual void update(const void* data, size_t length) CXX11_OVERRIDE { virtual void update(const void* data, size_t length) CXX11_OVERRIDE
{
auto bytes = reinterpret_cast<const char*>(data); auto bytes = reinterpret_cast<const char*>(data);
while (length) { while (length) {
size_t l = std::min(length, (size_t)std::numeric_limits<uint32_t>::max()); size_t l = std::min(length, (size_t)std::numeric_limits<uint32_t>::max());
@ -73,7 +77,8 @@ public:
bytes += l; bytes += l;
} }
} }
virtual void digest(unsigned char* md) CXX11_OVERRIDE { virtual void digest(unsigned char* md) CXX11_OVERRIDE
{
final_fn(ctx_, md); final_fn(ctx_, md);
} }
private: private:
@ -99,7 +104,7 @@ MessageDigestSHA1;
std::unique_ptr<MessageDigestImpl> MessageDigestImpl::sha1() std::unique_ptr<MessageDigestImpl> MessageDigestImpl::sha1()
{ {
return std::unique_ptr<MessageDigestImpl>(new MessageDigestSHA1()); return make_unique<MessageDigestSHA1>();
} }
MessageDigestImpl::hashes_t MessageDigestImpl::hashes = { MessageDigestImpl::hashes_t MessageDigestImpl::hashes = {