Merge branch 'master' into random-webseeding

1 files changed, 12 insertions, 18 deletions

diff --git a/src/LibgcryptMessageDigestImpl.cc b/src/LibgcryptMessageDigestImpl.cc
index a79417d5..6edc985a 100644
--- a/src/LibgcryptMessageDigestImpl.cc
+++ b/src/LibgcryptMessageDigestImpl.cc
@@ -42,11 +42,11 @@
 namespace aria2 {
 
 namespace {
-template<int hash>
-class MessageDigestBase : public MessageDigestImpl {
+template <int hash> class MessageDigestBase : public MessageDigestImpl {
 private:
   struct Deleter {
-    void operator()(gcry_md_hd_t ctx) {
+    void operator()(gcry_md_hd_t ctx)
+    {
       if (ctx) {
         gcry_md_close(ctx);
       }
@@ -64,19 +64,14 @@ public:
 
   virtual ~MessageDigestBase() {}
 
-  static size_t length()
-  {
-    return ::gcry_md_get_algo_dlen(hash);
-  }
+  static size_t length() { return ::gcry_md_get_algo_dlen(hash); }
 
   virtual size_t getDigestLength() const CXX11_OVERRIDE
   {
     return ::gcry_md_get_algo_dlen(hash);
   }
 
-  virtual void reset() CXX11_OVERRIDE {
-    ::gcry_md_reset(ctx_.get());
-  }
+  virtual void reset() CXX11_OVERRIDE { ::gcry_md_reset(ctx_.get()); }
 
   virtual void update(const void* data, size_t length) CXX11_OVERRIDE
   {
@@ -112,13 +107,12 @@ std::unique_ptr<MessageDigestImpl> MessageDigestImpl::sha1()
 }
 
 MessageDigestImpl::hashes_t MessageDigestImpl::hashes = {
-  { "sha-1", make_hi<MessageDigestSHA1>() },
-  { "sha-224", make_hi<MessageDigestSHA224>() },
-  { "sha-256", make_hi<MessageDigestSHA256>() },
-  { "sha-384", make_hi<MessageDigestSHA384>() },
-  { "sha-512", make_hi<MessageDigestSHA512>() },
-  { "md5", make_hi<MessageDigestMD5>() },
-  ADLER32_MESSAGE_DIGEST
-};
+    {"sha-1", make_hi<MessageDigestSHA1>()},
+    {"sha-224", make_hi<MessageDigestSHA224>()},
+    {"sha-256", make_hi<MessageDigestSHA256>()},
+    {"sha-384", make_hi<MessageDigestSHA384>()},
+    {"sha-512", make_hi<MessageDigestSHA512>()},
+    {"md5", make_hi<MessageDigestMD5>()},
+    ADLER32_MESSAGE_DIGEST};
 
 } // namespace aria2