about summary refs log tree commit diff
path: root/third_party/nix/src/libstore/crypto.cc
diff options
context:
space:
mode:
authorVincent Ambo <tazjin@google.com>2020-05-19T17·55+0100
committerVincent Ambo <tazjin@google.com>2020-05-19T17·55+0100
commit867055133d3f487e52dd44149f76347c2c28bf10 (patch)
treec367803ad94f024b0052727a2c7a037af169169a /third_party/nix/src/libstore/crypto.cc
parentc6a31838cd7e88ebcb01422b329a499d04ab4b6b (diff)
style(3p/nix): Add braces around single-line conditionals r/771
These were not caught by the previous clang-tidy invocation, but were
instead sorted out using amber[0] as such:

    ambr --regex 'if (\(.+\))\s([a-z].*;)' 'if $1 { $2 }'

[0]: https://github.com/dalance/amber
Diffstat (limited to 'third_party/nix/src/libstore/crypto.cc')
-rw-r--r--third_party/nix/src/libstore/crypto.cc16
1 files changed, 12 insertions, 4 deletions
diff --git a/third_party/nix/src/libstore/crypto.cc b/third_party/nix/src/libstore/crypto.cc
index 44c512d33b..7a169107c1 100644
--- a/third_party/nix/src/libstore/crypto.cc
+++ b/third_party/nix/src/libstore/crypto.cc
@@ -11,7 +11,9 @@ namespace nix {
 
 static std::pair<std::string, std::string> split(const string& s) {
   size_t colon = s.find(':');
-  if (colon == std::string::npos || colon == 0) return {"", ""};
+  if (colon == std::string::npos || colon == 0) {
+    return {"", ""};
+  }
   return {std::string(s, 0, colon), std::string(s, colon + 1)};
 }
 
@@ -21,7 +23,9 @@ Key::Key(const string& s) {
   name = ss.first;
   key = ss.second;
 
-  if (name == "" || key == "") throw Error("secret key is corrupt");
+  if (name == "" || key == "") {
+    throw Error("secret key is corrupt");
+  }
 
   key = base64Decode(key);
 }
@@ -76,10 +80,14 @@ bool verifyDetached(const std::string& data, const std::string& sig,
   auto ss = split(sig);
 
   auto key = publicKeys.find(ss.first);
-  if (key == publicKeys.end()) return false;
+  if (key == publicKeys.end()) {
+    return false;
+  }
 
   auto sig2 = base64Decode(ss.second);
-  if (sig2.size() != crypto_sign_BYTES) throw Error("signature is not valid");
+  if (sig2.size() != crypto_sign_BYTES) {
+    throw Error("signature is not valid");
+  }
 
   return crypto_sign_verify_detached(
              (unsigned char*)sig2.data(), (unsigned char*)data.data(),