Merge pull request #3 from Bollos00/crypto-rand

implement crypto/rand instead of math/rand
Bollos00 · Dec 19, 2021 · 7d5c2e4 · 7d5c2e4
2 parents 5f49750 + d26f45e
commit 7d5c2e4
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 10 deletions.
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -10,13 +10,20 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        # build and publish in parallel: linux/386, linux/amd64, windows/386, windows/amd64, darwin/386, darwin/amd64 
+        # build and publish in parallel for different OSs and architectures 
         goos: [linux, windows, darwin]
         goarch: ["386", amd64]
+        exclude:  
+          - goarch: "386"
+            goos: darwin
     steps:
     - uses: actions/checkout@v2
-    - uses: wangyoucao577/go-release-action@v1.3
+    - uses: wangyoucao577/go-release-action@latest
       with:
         github_token: ${{ secrets.GITHUB_TOKEN }}
         goos: ${{ matrix.goos }}
-        pre_command: "go get -v -t -d ./... "
+        goarch: ${{ matrix.goarch }}
+        extra_files: LICENSE README.md
+        md5sum: False
+        sha256sum: True
+        goversion: latest
diff --git a/src/passwgen/passwgen.go b/src/passwgen/passwgen.go
@@ -25,9 +25,9 @@
 package passwgen
 
 import (
+	"crypto/rand"
 	"fmt"
-	"math/rand"
-	"time"
+	"math/big"
 
 	"github.com/atotto/clipboard"
 )
@@ -134,10 +134,10 @@ func (psg PasswGen) Generate() string {
 		availableChars = append(availableChars, NumeralChars()...)
 	}
 	if psg.CharactersType&UpperLetter != 0 {
-		availableChars = append(availableChars, LowerLetterChars()...)
+		availableChars = append(availableChars, UpperLetterChars()...)
 	}
 	if psg.CharactersType&LowerLetter != 0 {
-		availableChars = append(availableChars, UpperLetterChars()...)
+		availableChars = append(availableChars, LowerLetterChars()...)
 	}
 	if psg.CharactersType&Special != 0 {
 		availableChars = append(availableChars, SpecialChars()...)
@@ -152,15 +152,16 @@ func (psg PasswGen) Generate() string {
 
 	fmt.Printf("Available characters: %c\n\n", availableChars)
 
-	rand.Seed(time.Now().UnixNano())
+	v, _ := rand.Int(rand.Reader, big.NewInt(int64(psg.MaxSize-psg.MinSize+1)))
 
-	password_size := psg.MinSize + rand.Intn(psg.MaxSize-psg.MinSize+1)
+	password_size := psg.MinSize + int(v.Int64())
 	fmt.Printf("Password size: %v\n\n", password_size)
 
 	password := make([]byte, password_size)
 
 	for i := range password {
-		password[i] = availableChars[rand.Intn(int(len(availableChars)))]
+		vc, _ := rand.Int(rand.Reader, big.NewInt(int64(len(availableChars))))
+		password[i] = availableChars[int(vc.Int64())]
 	}
 
 	if psg.CopyClipboard {