aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcui fliter <imcusg@gmail.com>2022-09-07 12:51:24 +0000
committerKeith Randall <khr@golang.org>2022-11-09 16:50:04 +0000
commit21d60a152191de71c82a8101779e876bb03773b7 (patch)
treec8e64c96f35d8f776dc44eedd115d018dbb6dec7
parent183a9b70cc805eca27c9474ce65820b468a28795 (diff)
downloadgo-x-crypto-21d60a152191de71c82a8101779e876bb03773b7.tar.xz
all: remove redundant type conversion
Change-Id: Ic6b210c1e5b99eef5c6e38d96feaf40e7e6033bb GitHub-Last-Rev: b8ecf761efe6a2eec78a805a99d778bdcdb938f9 GitHub-Pull-Request: golang/crypto#229 Reviewed-on: https://go-review.googlesource.com/c/crypto/+/429016 Run-TryBot: Ian Lance Taylor <iant@google.com> Reviewed-by: Ian Lance Taylor <iant@google.com> TryBot-Result: Gopher Robot <gobot@golang.org> Reviewed-by: Michael Knyszek <mknyszek@google.com>
-rw-r--r--bcrypt/bcrypt.go2
-rw-r--r--cryptobyte/asn1.go4
-rw-r--r--openpgp/armor/armor.go2
3 files changed, 4 insertions, 4 deletions
diff --git a/bcrypt/bcrypt.go b/bcrypt/bcrypt.go
index aeb73f8..addf56b 100644
--- a/bcrypt/bcrypt.go
+++ b/bcrypt/bcrypt.go
@@ -50,7 +50,7 @@ func (ih InvalidHashPrefixError) Error() string {
type InvalidCostError int
func (ic InvalidCostError) Error() string {
- return fmt.Sprintf("crypto/bcrypt: cost %d is outside allowed range (%d,%d)", int(ic), int(MinCost), int(MaxCost))
+ return fmt.Sprintf("crypto/bcrypt: cost %d is outside allowed range (%d,%d)", int(ic), MinCost, MaxCost)
}
const (
diff --git a/cryptobyte/asn1.go b/cryptobyte/asn1.go
index 3a1674a..a64c1d7 100644
--- a/cryptobyte/asn1.go
+++ b/cryptobyte/asn1.go
@@ -532,7 +532,7 @@ func (s *String) ReadASN1BitString(out *encoding_asn1.BitString) bool {
return false
}
- paddingBits := uint8(bytes[0])
+ paddingBits := bytes[0]
bytes = bytes[1:]
if paddingBits > 7 ||
len(bytes) == 0 && paddingBits != 0 ||
@@ -554,7 +554,7 @@ func (s *String) ReadASN1BitStringAsBytes(out *[]byte) bool {
return false
}
- paddingBits := uint8(bytes[0])
+ paddingBits := bytes[0]
if paddingBits != 0 {
return false
}
diff --git a/openpgp/armor/armor.go b/openpgp/armor/armor.go
index be342ad..8907183 100644
--- a/openpgp/armor/armor.go
+++ b/openpgp/armor/armor.go
@@ -156,7 +156,7 @@ func (r *openpgpReader) Read(p []byte) (n int, err error) {
n, err = r.b64Reader.Read(p)
r.currentCRC = crc24(r.currentCRC, p[:n])
- if err == io.EOF && r.lReader.crcSet && r.lReader.crc != uint32(r.currentCRC&crc24Mask) {
+ if err == io.EOF && r.lReader.crcSet && r.lReader.crc != r.currentCRC&crc24Mask {
return 0, ArmorCorrupt
}