X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=cmd%2Fballoon%2Fmain.go;h=0c737c9dd794dfe9e6b5e095328e519e71fa4f5a;hb=3524ab4193dc8d7ad50c76edb0aac02c062918ee;hp=8283a5345e0432e66a73e66ef4f270768b3c06cb;hpb=03649070f780ed40a3a6303b1c5a0cc5f7bdd8c5;p=balloon.git

diff --git a/cmd/balloon/main.go b/cmd/balloon/main.go
index 8283a53..0c737c9 100644
--- a/cmd/balloon/main.go
+++ b/cmd/balloon/main.go
@@ -1,25 +1,31 @@
 package main
 
 import (
+	"crypto/rand"
 	"crypto/sha512"
 	"encoding/hex"
 	"flag"
 	"fmt"
+	"io"
 
-	"cypherpunks.ru/balloon"
-)
-
-var (
-	s       = flag.Int("s", 1<<18, "Space cost, number of hash-sized blocks")
-	t       = flag.Int("t", 2, "Time cost, rounds")
-	p       = flag.Int("p", 4, "Number of threads")
-	saltHex = flag.String("salt", "deadbabe", "Salt, hexadecimal")
-	passwd  = flag.String("passwd", "", "Password")
+	"go.cypherpunks.ru/balloon"
 )
 
 func main() {
+	s := flag.Int("s", 1<<18, "Space cost, number of hash-sized blocks")
+	t := flag.Int("t", 2, "Time cost, rounds")
+	p := flag.Int("p", 4, "Number of threads")
+	saltHex := flag.String("salt", "", "Salt, hexadecimal, optional")
+	passwd := flag.String("passwd", "", "Password")
 	flag.Parse()
-	salt, err := hex.DecodeString(*saltHex)
+	var salt []byte
+	var err error
+	if len(*saltHex) == 0 {
+		salt = make([]byte, 8)
+		_, err = io.ReadFull(rand.Reader, salt)
+	} else {
+		salt, err = hex.DecodeString(*saltHex)
+	}
 	if err != nil {
 		panic(err)
 	}