X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=cmd%2Fballoon%2Fmain.go;h=e5d42d303291904439c8d8befbe70d41d2255b92;hb=HEAD;hp=b7fd973b5874af07430ffca10b3420f1f8bc9e24;hpb=8db12c1d04f1d1bc2311c42a08812f511bfae721;p=balloon.git

diff --git a/cmd/balloon/main.go b/cmd/balloon/main.go
index b7fd973..e5d42d3 100644
--- a/cmd/balloon/main.go
+++ b/cmd/balloon/main.go
@@ -1,39 +1,38 @@
-/*
-balloon -- Balloon password hashing function
-Copyright (C) 2016-2019 Sergey Matveev <stargrave@stargrave.org>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU Lesser General Public License as
-the Free Software Foundation, version 3 of the License.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-License along with this program.  If not, see
-<http://www.gnu.org/licenses/>.
-*/
+// balloon -- Balloon password hashing function
+// Copyright (C) 2016-2024 Sergey Matveev <stargrave@stargrave.org>
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Lesser General Public License as
+// the Free Software Foundation, version 3 of the License.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this program.  If not, see
+// <http://www.gnu.org/licenses/>.
 
 package main
 
 import (
 	"crypto/rand"
 	"crypto/sha512"
+	"encoding/base64"
 	"encoding/hex"
 	"flag"
 	"fmt"
 	"io"
 	"os"
 
-	"go.cypherpunks.ru/balloon"
+	"go.cypherpunks.ru/balloon/v2"
 )
 
 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")
+	s := flag.Int("s", 1<<16, "Space cost, number of hash-sized blocks")
+	t := flag.Int("t", 3, "Time cost, rounds")
+	p := flag.Int("p", 1, "Number of threads")
 	saltHex := flag.String("salt", "", "Salt, hexadecimal, optional")
 	passwd := flag.String("passwd", "", "Password")
 	flag.Usage = func() {
@@ -52,5 +51,13 @@ func main() {
 	if err != nil {
 		panic(err)
 	}
-	fmt.Println(hex.EncodeToString(balloon.H(sha512.New, []byte(*passwd), salt, *s, *t, *p)))
+	fmt.Println("Salt:", hex.EncodeToString(salt))
+	h := balloon.H(sha512.New, []byte(*passwd), salt, *s, *t, *p)
+	fmt.Println("Hash:", hex.EncodeToString(h))
+	fmt.Printf(
+		"Encoded: $balloon$h=sha512,s=%d,t=%d,p=%d$%s$%s\n",
+		*s, *t, *p,
+		base64.RawStdEncoding.EncodeToString(salt),
+		base64.RawStdEncoding.EncodeToString(h),
+	)
 }