summaryrefslogtreecommitdiff
path: root/src/util_security.cc
diff options
context:
space:
mode:
authorTatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>2015-12-27 18:39:47 +0900
committerTatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>2015-12-27 18:40:08 +0900
commitb1132d6b10cd3791b9529d7031d723fd0e2d8215 (patch)
tree9ce465b42bf09372118335c7c619bb2b41869eaf /src/util_security.cc
parent4abad2f64c9ff80144a61c5a9c2bea144852b883 (diff)
make clang-format using clang-format-3.6
Diffstat (limited to 'src/util_security.cc')
-rw-r--r--src/util_security.cc13
1 files changed, 5 insertions, 8 deletions
diff --git a/src/util_security.cc b/src/util_security.cc
index c7984cfc..0580fd69 100644
--- a/src/util_security.cc
+++ b/src/util_security.cc
@@ -97,9 +97,9 @@ bool compare(const uint8_t* a, const uint8_t* b, size_t length)
}
HMAC::HMAC(const std::string& algorithm, const char* secret, size_t length)
- : blockSize_(getBlockSize(algorithm)),
- md_(MessageDigest::create(algorithm)),
- clean_(false)
+ : blockSize_(getBlockSize(algorithm)),
+ md_(MessageDigest::create(algorithm)),
+ clean_(false)
{
ipad_.assign(blockSize_, 0x36);
opad_.assign(blockSize_, 0x5c);
@@ -143,11 +143,8 @@ bool HMAC::supports(const std::string& algorithm)
canon == "sha-384" || canon == "sha-512";
}
-HMACResult PBKDF2(HMAC* hmac,
- const char* salt,
- size_t salt_length,
- size_t iterations,
- size_t key_length)
+HMACResult PBKDF2(HMAC* hmac, const char* salt, size_t salt_length,
+ size_t iterations, size_t key_length)
{
if (!hmac) {
throw FATAL_EXCEPTION("hmac cannot be null");