Improve the validator

idk · idk · commit 42839924e750 · 2019-04-05T21:09:48.000-04:00
diff --git a/transcoders.go b/transcoders.go
@@ -283,9 +283,9 @@ func garlic32BtS(b []byte) (string, error) {
 func garlic32Validate(b []byte) error {
 	// an i2p base64 for an Encrypted Leaseset v2 will be at least 35 bytes
 	// long
-	if len(b) > 35 {
-		// other than that, they will be at least 32 bytes
-		if len(b) < 32 {
+	if len(b) < 35 {
+		// other than that, they will be exactly 32 bytes
+		if len(b) != 32 {
 			return fmt.Errorf("failed to validate garlic addr: %s not an i2p base32 address. len: %d\n", b, len(b))
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -283,9 +283,9 @@ func garlic32BtS(b []byte) (string, error) {`
`283`	`283`	`func garlic32Validate(b []byte) error {`
`284`	`284`	`// an i2p base64 for an Encrypted Leaseset v2 will be at least 35 bytes`
`285`	`285`	`// long`
`286`		`- if len(b) > 35 {`
`287`		`- // other than that, they will be at least 32 bytes`
`288`		`- if len(b) < 32 {`
	`286`	`+ if len(b) < 35 {`
	`287`	`+ // other than that, they will be exactly 32 bytes`
	`288`	`+ if len(b) != 32 {`
`289`	`289`	`return fmt.Errorf("failed to validate garlic addr: %s not an i2p base32 address. len: %d\n", b, len(b))`
`290`	`290`	`}`
`291`	`291`	`}`