fixing consts

hashicorp · Jan 20, 2022 · 45149f8 · 45149f8
1 parent d138e5c
commit 45149f8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 10 deletions.
diff --git a/command/base_flags.go b/command/base_flags.go
@@ -10,15 +10,10 @@ import (
 	"strings"
 	"time"
 
+	"github.com/hashicorp/vault/sdk/helper/consts"
 	"github.com/posener/complete"
 )
 
-const (
-	MaxUint = ^uint(0)
-	MaxInt  = int(MaxUint >> 1)
-	MinInt  = -MaxInt - 1
-)
-
 // FlagExample is an interface which declares an example value.
 type FlagExample interface {
 	Example() string
@@ -252,7 +247,7 @@ func (i *intValue) Set(s string) error {
 	if err != nil {
 		return err
 	}
-	if v >= int64(MinInt) && v <= int64(MaxInt) {
+	if v >= int64(consts.MinInt) && v <= int64(consts.MaxInt) {
 		*i.target = int(v)
 		return nil
 	}
@@ -382,7 +377,7 @@ func (i *uintValue) Set(s string) error {
 	if err != nil {
 		return err
 	}
-	if v >= 0 && v <= uint64(MaxUint) {
+	if v >= 0 && v <= uint64(consts.MaxUint) {
 		*i.target = uint(v)
 		return nil
 	}

diff --git a/vault/barrier_aes_gcm.go b/vault/barrier_aes_gcm.go
@@ -15,6 +15,8 @@ import (
 	"sync"
 	"time"
 
+	"github.com/hashicorp/vault/sdk/helper/consts"
+
 	"github.com/armon/go-metrics"
 	"github.com/hashicorp/go-secure-stdlib/strutil"
 	"github.com/hashicorp/vault/sdk/helper/jsonutil"
@@ -33,7 +35,6 @@ const (
 
 	autoRotateCheckInterval = 5 * time.Minute
 	legacyRotateReason      = "legacy rotation"
-	MaxInt                  = int(^uint(0) >> 1)
 )
 
 // Versions of the AESGCM storage methodology
@@ -962,7 +963,7 @@ func (b *AESGCMBarrier) encrypt(path string, term uint32, gcm cipher.AEAD, plain
 	// nonce, GCM tag and the plaintext
 
 	extra := termSize + 1 + gcm.NonceSize() + gcm.Overhead()
-	if len(plain) > MaxInt-extra {
+	if len(plain) > consts.MaxInt-extra {
 		return nil, ErrPlaintextTooLarge
 	}