Add support for NIST instances and fix bug with SHA2&n=16.

algs.go

@@ -20,7 +20,7 @@ func cmdAlgs(c *cli.Context) error {
 		"sigSize",
 		"cache size"})
 	names := xmssmt.ListNames()
-	if c.Bool("non-rfc") {
+	if c.Bool("non-std") {
 		names = xmssmt.ListNames2()
 	}
 	for _, name := range names {

generate.go

@@ -45,12 +45,26 @@ func cmdGenerate(c *cli.Context) error {
 			params.Func = xmssmt.SHA2
 		case "shake":
 			params.Func = xmssmt.SHAKE
+		case "shake256":
+			params.Func = xmssmt.SHAKE256
 		default:
 			return cli.NewExitError(fmt.Sprintf(
 				"The hash function %s is not supported", c.String("hash")), 2)
 		}
 	}
 
+	if c.IsSet("prf") {
+		switch c.String("prf") {
+		case "rfc":
+			params.Prf = xmssmt.RFC
+		case "nist":
+			params.Prf = xmssmt.NIST
+		default:
+			return cli.NewExitError(fmt.Sprintf(
+				"The PRF %s is not supported", c.String("prf")), 23)
+		}
+	}
+
 	ctx, err := xmssmt.NewContext(*params)
 
 	if err != nil {

go.mod

@@ -1,7 +1,7 @@
 module github.com/bwesterb/xmssmt
 
 require (
-	github.com/bwesterb/go-xmssmt v1.3.0
+	github.com/bwesterb/go-xmssmt v1.4.0
 	github.com/cpuguy83/go-md2man/v2 v2.0.0 // indirect
 	github.com/dustin/go-humanize v1.0.0
 	github.com/mattn/go-runewidth v0.0.9 // indirect

go.sum

@@ -1,10 +1,13 @@
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/OneOfOne/xxhash v1.2.2 h1:KMrpdQIwFcEqXDklaen+P1axHaj9BSKzvpUUfnHldSE=
 github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
+github.com/alvaroloes/enumer v1.1.2/go.mod h1:FxrjvuXoDAx9isTJrv4c+T410zFi0DtXIT0m65DJ+Wo=
 github.com/bwesterb/byteswriter v1.0.0 h1:xY3MWW1N1jiJ2qlw6/U3YjqyuqNIYu3W7KOCiBbtZp8=
 github.com/bwesterb/byteswriter v1.0.0/go.mod h1:Gm9TBFNK7ypbrMrWZXBYqX2S1N8mc8DdoHW+Rl002Pc=
 github.com/bwesterb/go-xmssmt v1.3.0 h1:62RiZEpiXdyl5eKId+VVQiWcPtitVocQJU/E7S9lF+s=
 github.com/bwesterb/go-xmssmt v1.3.0/go.mod h1:r12Xc4oWDZUJwxu/GYhwVmBcY5AqIBFvfQpfrz2MmRo=
+github.com/bwesterb/go-xmssmt v1.4.0 h1:aem6Q8OuiLZuKXf4/shLGI+Qy7N3zsOO2/Ga8XfacM0=
+github.com/bwesterb/go-xmssmt v1.4.0/go.mod h1:HF48A0WMH2E21wN2oly7j2WVSGxxBaXt497K/nsTdgg=
 github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko=
 github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
 github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d h1:U+s90UTSYgptZMwQh2aRr3LuazLJIa+Pg3Kc1ylSYVY=
@@ -27,6 +30,7 @@ github.com/nightlyone/lockfile v1.0.0 h1:RHep2cFKK4PonZJDdEl4GmkabuhbsRMgk/k3uAm
 github.com/nightlyone/lockfile v1.0.0/go.mod h1:rywoIealpdNse2r832aiD9jRk8ErCatROs6LzC841CI=
 github.com/olekukonko/tablewriter v0.0.4 h1:vHD/YYe1Wolo78koG299f7V/VAS08c6IpCLn+Ejf/w8=
 github.com/olekukonko/tablewriter v0.0.4/go.mod h1:zq6QwlOf5SlnkVbMSr5EoBv3636FWnp+qbPhuoO21uA=
+github.com/pascaldekloe/name v0.0.0-20180628100202-0fd16699aae1/go.mod h1:eD5JxqMiuNYyFNmyY9rkJ/slN8y59oEu4Ei7F8OoKWQ=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/russross/blackfriday/v2 v2.0.1 h1:lPqVAte+HuHNfhJ/0LC98ESWRz8afy9tM/0RK8m9o+Q=
@@ -35,20 +39,29 @@ github.com/shurcooL/sanitized_anchor_name v1.0.0 h1:PdmoCO6wvbs+7yrJyMORt4/BmY5I
 github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
 github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72 h1:qLC7fQah7D6K1B0ujays3HV9gkFtllcxhzImRR7ArPQ=
 github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
+github.com/templexxx/cpu v0.0.1 h1:hY4WdLOgKdc8y13EYklu9OUTXik80BkxHoWvTO6MQQY=
+github.com/templexxx/cpu v0.0.1/go.mod h1:w7Tb+7qgcAlIyX4NhLuDKt78AHA5SzPmq0Wj6HiEnnk=
 github.com/templexxx/cpufeat v0.0.0-20180724012125-cef66df7f161 h1:89CEmDvlq/F7SJEOqkIdNDGJXrQIhuIx9D2DBXjavSU=
 github.com/templexxx/cpufeat v0.0.0-20180724012125-cef66df7f161/go.mod h1:wM7WEvslTq+iOEAMDLSzhVuOt5BRZ05WirO+b09GHQU=
 github.com/templexxx/xor v0.0.0-20191217153810-f85b25db303b h1:fj5tQ8acgNUr6O8LEplsxDhUIe2573iLkJc+PqnzZTI=
 github.com/templexxx/xor v0.0.0-20191217153810-f85b25db303b/go.mod h1:5XA7W9S6mni3h5uvOC75dA3m9CCCaS83lltmc0ukdi4=
+github.com/templexxx/xorsimd v0.4.1 h1:iUZcywbOYDRAZUasAs2eSCUW8eobuZDy0I9FJiORkVg=
+github.com/templexxx/xorsimd v0.4.1/go.mod h1:W+ffZz8jJMH2SXwuKu9WhygqBMbFnp14G2fqEr8qaNo=
 github.com/urfave/cli v1.22.4 h1:u7tSpNPPswAFymm8IehJhy4uJMlUuU/GmqSkvJ1InXA=
 github.com/urfave/cli v1.22.4/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20200510223506-06a226fb4e37 h1:cg5LA/zNPRzIXIWSCxQW10Rvpy94aQh3LT/ShoCpkHw=
 golang.org/x/crypto v0.0.0-20200510223506-06a226fb4e37/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9 h1:YTzHMGlqJu67/uEo1lBv0n3wBXhXNeUbB1XfN2vmTm0=
 golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200523222454-059865788121 h1:rITEj+UZHYC927n8GT97eC3zrpzXdb/voyeOuVKS46o=
+golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/tools v0.0.0-20190524210228-3d17549cdc6b/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=

main.go

@@ -30,8 +30,9 @@ func main() {
 			Action: cmdAlgs,
 			Flags: []cli.Flag{
 				cli.BoolFlag{
-					Name:  "non-rfc, n",
-					Usage: "Include instances which are not listed in the RFC",
+					Name: "non-std, n",
+					Usage: "Include instances which are not listed in the RFC " +
+						"or NIST standard",
 				},
 			},
 		},
@@ -71,9 +72,13 @@ func main() {
 				},
 				cli.StringFlag{
 					Name:  "hash, H",
-					Usage: "Override hash function to use. (Either shake or sha2)",
+					Usage: "Override hash function to use. (shake, shake256 or sha2)",
 					Value: "shake",
 				},
+				cli.StringFlag{
+					Name:  "prf, P",
+					Usage: "Override prf function to use. (rfc or nist)",
+				},
 				cli.StringFlag{
 					Name:  "privkey, s",
 					Usage: "Path to store private key at",
@@ -140,8 +145,9 @@ func main() {
 					Usage: "Look for existing key in current working directory",
 				},
 				cli.BoolFlag{
-					Name:  "non-rfc, n",
-					Usage: "Include instances which are not listed in the RFC",
+					Name: "non-std, n",
+					Usage: "Include instances which are not listed in the " +
+						"RFC or NIST standard",
 				},
 			},
 		},

speed.go

@@ -68,7 +68,7 @@ func cmdSpeed(c *cli.Context) error {
 		toTest = []string{algFlag}
 	} else {
 		toTest = xmssmt.ListNames()
-		if c.Bool("non-rfc") {
+		if c.Bool("non-std") {
 			toTest = xmssmt.ListNames2()
 		}
 	}