go.mod

@@ -1,3 +1,3 @@
 module GoPass
 
-go 1.20
+go 1.19

main.go

@@ -7,7 +7,6 @@ import (
 	"fmt"
 	"math/big"
 	"os"
-	"runtime"
 	"strconv"
 	"strings"
 )
@@ -15,9 +14,8 @@ import (
 var allowedCharacters = []rune("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890`~!@#$%^&*()_+[]\\{}|;':,./<>?")
 
 const (
-	Version   = "1.3.1"
-	symbols   = "`~!@#$%^&*()_+[]\\{}|;':,./<>?"
-	chunkSize = 16 // The size of each chunk of the password to be generated by the worker goroutines
+	Version = "1.3.0"
+	symbols = "`~!@#$%^&*()_+[]\\{}|;':,./<>?"
 )
 
 func matchArguments(args []string) string {
@@ -28,10 +26,11 @@ func matchArguments(args []string) string {
 
 	// First argument is special, must be an integer, -v, or -h
 	var size = 0 // Password length
-	switch args[0] {
-	case "-v":
+	err := error(nil)
+	if size, err = strconv.Atoi(args[0]); err == nil { // If first argument is an integer
+	} else if args[0] == "-v" {
 		return "GoPass version " + Version
-	case "-h":
+	} else if args[0] == "-h" {
 		return "GoPass - A simple password generator written in Go\n" +
 			"Usage: gopass [length] [disallowed characters] [optional remove symbols -s]\n" +
 			"     Example: gopass 16\n" +
@@ -39,23 +38,16 @@ func matchArguments(args []string) string {
 			"     Example: gopass 16 -s\n" +
 			"\nFor help (this output): gopass -h\n" +
 			"For version: gopass -v\n"
-	default:
-		err := error(nil)
-		size, err = strconv.Atoi(args[0])
-		if err != nil {
-			return "Invalid first argument (\"" + args[0] + "\") supplied! (Type gopass -h for help)"
-		}
 	}
 
 	for i := 1; i < len(args); i++ {
 		v := args[i]
-		switch {
-		case v == "-s":
+		if v == "-s" {
 			removeDisallowed([]rune(symbols))
-		case strings.HasPrefix(v, "-r="):
+		} else if strings.HasPrefix(v, "-r=") { // If argument starts with -r=
 			// Remove all characters after the = until next whitespace
 			removeDisallowed([]rune(v[2:]))
-		default:
+		} else {
 			return "Invalid argument (\"" + v + "\") supplied! (Type gopass -h for help)"
 		}
 	}
@@ -69,57 +61,28 @@ func matchArguments(args []string) string {
 
 // Remove all disallowed characters from the allowedCharacters slice
 func removeDisallowed(disallowed []rune) {
-	disallowedMap := make(map[rune]bool, len(disallowed))
 	for _, r := range disallowed {
-		disallowedMap[r] = true
-	}
-
-	i := 0
-	for _, v := range allowedCharacters {
-		if !disallowedMap[v] {
-			allowedCharacters[i] = v
-			i++
+		for i, v := range allowedCharacters {
+			if v == r {
+				allowedCharacters = append(allowedCharacters[:i], allowedCharacters[i+1:]...)
+			}
 		}
 	}
-	allowedCharacters = allowedCharacters[:i]
 }
 
 func generatePassword(size int) string {
 	// Make empty array of runes with size of size
 	pass := make([]rune, size)
 
-	// Create a channel to receive chunks of the password
-	passChan := make(chan []rune)
-
-	// Determine the number of worker goroutines to use
-	numWorkers := runtime.NumCPU()
-
-	// Launch the worker goroutines
-	for i := 0; i < numWorkers; i++ {
-		go func() {
-			allowedLen := len(allowedCharacters)
-			for {
-				// Generate a chunk of the password
-				chunk := make([]rune, chunkSize)
-				for i := range chunk {
-					index, err := rand.Int(rand.Reader, big.NewInt(int64(allowedLen)))
-					if err != nil {
-						println("Error securely generating random character chunk!")
-						return
-					}
-					chunk[i] = allowedCharacters[index.Int64()]
-				}
-
-				// Send the chunk of the password to the main goroutine
-				passChan <- chunk
-			}
-		}()
-	}
-
-	// Collect the chunks of the password from the channel
-	for i := 0; i < size; i += chunkSize {
-		chunk := <-passChan
-		copy(pass[i:], chunk)
+	// Assign every slot of pass to a random allowedCharacter
+	for i := range pass {
+		// Generate a random int greater than 0 and not to exceed the length of allowedCharacters
+		index, err := rand.Int(rand.Reader, big.NewInt(int64(len(allowedCharacters))))
+		if err != nil {
+			println("Error securely generating random character!")
+			return ""
+		}
+		pass[i] = allowedCharacters[index.Int64()]
 	}
 
 	return string(pass)

makefile

@@ -1,5 +1,5 @@
 # The current version number of the program
-VERSION := 1.3.1
+VERSION := 1.3.0
 
 # List of OS and architecture combinations to build
 BUILD_OS_ARCH := \