deps: github.com/hashicorp/terraform@sdk-v0.11-with-go-modules

Updated via: go get github.com/hashicorp/terraform@sdk-v0.11-with-go-modules and go mod tidy

2 files changed, 3 insertions, 4 deletions

diff --git a/vendor/golang.org/x/crypto/bcrypt/bcrypt.go b/vendor/golang.org/x/crypto/bcrypt/bcrypt.go
index 202fa8a..aeb73f8 100644
--- a/vendor/golang.org/x/crypto/bcrypt/bcrypt.go
+++ b/vendor/golang.org/x/crypto/bcrypt/bcrypt.go
@@ -241,11 +241,11 @@ func (p *hashed) Hash() []byte {
                 n = 3
         }
         arr[n] = '$'
-        n += 1
+        n++
         copy(arr[n:], []byte(fmt.Sprintf("%02d", p.cost)))
         n += 2
         arr[n] = '$'
-        n += 1
+        n++
         copy(arr[n:], p.salt)
         n += encodedSaltSize
         copy(arr[n:], p.hash)
diff --git a/vendor/golang.org/x/crypto/openpgp/keys.go b/vendor/golang.org/x/crypto/openpgp/keys.go
index 68b14c6..744e293 100644
--- a/vendor/golang.org/x/crypto/openpgp/keys.go
+++ b/vendor/golang.org/x/crypto/openpgp/keys.go
@@ -325,9 +325,8 @@ func ReadEntity(packets *packet.Reader) (*Entity, error) {
                 if e.PrivateKey, ok = p.(*packet.PrivateKey); !ok {
                         packets.Unread(p)
                         return nil, errors.StructuralError("first packet was not a public/private key")
-                } else {
-                        e.PrimaryKey = &e.PrivateKey.PublicKey
                 }
+                e.PrimaryKey = &e.PrivateKey.PublicKey
         }
 
         if !e.PrimaryKey.PubKeyAlgo.CanSign() {