Silence some linter checks.
Use empty() over size() == 0, and don't export the IterateAES*
functions. (They return private types.)
Change-Id: I8a8f33a64e28cc2eab789563c6ba91afa6df87f9
Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/43544
Commit-Queue: Adam Langley <agl@google.com>
Reviewed-by: Adam Langley <agl@google.com>
diff --git a/util/fipstools/acvp/acvptool/subprocess/block.go b/util/fipstools/acvp/acvptool/subprocess/block.go
index fa933c6..365399e 100644
--- a/util/fipstools/acvp/acvptool/subprocess/block.go
+++ b/util/fipstools/acvp/acvptool/subprocess/block.go
@@ -47,9 +47,9 @@
}
}
-// IterateAES implements the "AES Monte Carlo Test - ECB mode" from the ACVP
+// iterateAES implements the "AES Monte Carlo Test - ECB mode" from the ACVP
// specification.
-func IterateAES(transact func(n int, args ...[]byte) ([][]byte, error), encrypt bool, key, input, iv []byte) (mctResults []blockCipherMCTResult) {
+func iterateAES(transact func(n int, args ...[]byte) ([][]byte, error), encrypt bool, key, input, iv []byte) (mctResults []blockCipherMCTResult) {
for i := 0; i < 100; i++ {
var iteration blockCipherMCTResult
iteration.KeyHex = hex.EncodeToString(key)
@@ -83,9 +83,9 @@
return mctResults
}
-// IterateAESCBC implements the "AES Monte Carlo Test - CBC mode" from the ACVP
+// iterateAESCBC implements the "AES Monte Carlo Test - CBC mode" from the ACVP
// specification.
-func IterateAESCBC(transact func(n int, args ...[]byte) ([][]byte, error), encrypt bool, key, input, iv []byte) (mctResults []blockCipherMCTResult) {
+func iterateAESCBC(transact func(n int, args ...[]byte) ([][]byte, error), encrypt bool, key, input, iv []byte) (mctResults []blockCipherMCTResult) {
for i := 0; i < 100; i++ {
var iteration blockCipherMCTResult
iteration.KeyHex = hex.EncodeToString(key)
diff --git a/util/fipstools/acvp/acvptool/subprocess/subprocess.go b/util/fipstools/acvp/acvptool/subprocess/subprocess.go
index cfa300f..05d7fb5 100644
--- a/util/fipstools/acvp/acvptool/subprocess/subprocess.go
+++ b/util/fipstools/acvp/acvptool/subprocess/subprocess.go
@@ -76,8 +76,8 @@
"SHA2-256": &hashPrimitive{"SHA2-256", 32},
"SHA2-384": &hashPrimitive{"SHA2-384", 48},
"SHA2-512": &hashPrimitive{"SHA2-512", 64},
- "ACVP-AES-ECB": &blockCipher{"AES", 16, true, false, IterateAES},
- "ACVP-AES-CBC": &blockCipher{"AES-CBC", 16, true, true, IterateAESCBC},
+ "ACVP-AES-ECB": &blockCipher{"AES", 16, true, false, iterateAES},
+ "ACVP-AES-CBC": &blockCipher{"AES-CBC", 16, true, true, iterateAESCBC},
"ACVP-AES-CTR": &blockCipher{"AES-CTR", 16, false, true, nil},
"ACVP-AES-GCM": &aead{"AES-GCM", false},
"ACVP-AES-CCM": &aead{"AES-CCM", true},
diff --git a/util/fipstools/acvp/acvptool/subprocess/subprocess_test.go b/util/fipstools/acvp/acvptool/subprocess/subprocess_test.go
index c2cd9ae..2249aa3 100644
--- a/util/fipstools/acvp/acvptool/subprocess/subprocess_test.go
+++ b/util/fipstools/acvp/acvptool/subprocess/subprocess_test.go
@@ -438,7 +438,7 @@
},
{
algo: "ACVP-AES-ECB",
- p: &blockCipher{"AES", 16, true, false, IterateAES},
+ p: &blockCipher{"AES", 16, true, false, iterateAES},
validJSON: validACVPAESECB,
invalidJSON: invalidACVPAESECB,
expectedCalls: callsACVPAESECB,
diff --git a/util/fipstools/acvp/modulewrapper/modulewrapper.cc b/util/fipstools/acvp/modulewrapper/modulewrapper.cc
index ff5ef6c..1ffb432 100644
--- a/util/fipstools/acvp/modulewrapper/modulewrapper.cc
+++ b/util/fipstools/acvp/modulewrapper/modulewrapper.cc
@@ -84,7 +84,7 @@
for (size_t i = 0; i < spans.size(); i++) {
const auto &span = spans[i];
nums[i + 1] = span.size();
- if (span.size() == 0) {
+ if (span.empty()) {
continue;
}
