diff --git a/go.mod b/go.mod index 8860a232..66120a0e 100644 --- a/go.mod +++ b/go.mod @@ -1,47 +1,38 @@ module github.com/schollz/croc/v10 -go 1.22 - -toolchain go1.23.0 +go 1.23.1 require ( github.com/cespare/xxhash v1.1.0 github.com/chzyer/readline v1.5.1 github.com/denisbrodbeck/machineid v1.0.1 github.com/kalafut/imohash v1.1.0 + github.com/magisterquis/connectproxy v0.0.0-20200725203833-3582e84f0c9b + github.com/minio/highwayhash v1.0.3 github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06 github.com/schollz/cli/v2 v2.2.1 github.com/schollz/logger v1.2.0 - github.com/schollz/mnemonicode v1.0.2-0.20190421205639-63fa713ece0d github.com/schollz/pake/v3 v3.0.5 github.com/schollz/peerdiscovery v1.7.4 github.com/schollz/progressbar/v3 v3.16.0 github.com/stretchr/testify v1.9.0 golang.org/x/crypto v0.27.0 golang.org/x/net v0.29.0 + golang.org/x/sys v0.25.0 + golang.org/x/term v0.24.0 golang.org/x/time v0.6.0 -) - -require ( - github.com/minio/highwayhash v1.0.3 gortc.io/stun v1.23.0 ) require ( - github.com/OneOfOne/xxhash v1.2.8 // indirect - github.com/cpuguy83/go-md2man/v2 v2.0.4 // indirect + github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d // indirect github.com/davecgh/go-spew v1.1.1 // indirect - github.com/magisterquis/connectproxy v0.0.0-20200725203833-3582e84f0c9b github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rivo/uniseg v0.4.7 // indirect - github.com/russross/blackfriday/v2 v2.1.0 // indirect - github.com/spaolacci/murmur3 v1.1.0 // indirect - github.com/tscholl2/siec v0.0.0-20240310163802-c2c6f6198406 // indirect - github.com/twmb/murmur3 v1.1.8 // indirect - golang.org/x/sys v0.25.0 - golang.org/x/term v0.24.0 - golang.org/x/text v0.18.0 // indirect - gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect + github.com/russross/blackfriday/v2 v2.0.1 // indirect + github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect + github.com/tscholl2/siec v0.0.0-20210707234609-9bdfc483d499 // indirect + github.com/twmb/murmur3 v1.1.5 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/go.sum b/go.sum index 99d376fe..d7822204 100644 --- a/go.sum +++ b/go.sum @@ -1,7 +1,6 @@ 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/OneOfOne/xxhash v1.2.8 h1:31czK/TI9sNkxIKfaUfGlU47BAxQ0ztGgd9vPyqimf8= -github.com/OneOfOne/xxhash v1.2.8/go.mod h1:eZbhyaAYD41SGSSsnmcpxVoRiQ/MPUTjUdIIOT9Um7Q= github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko= github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= github.com/chengxilo/virtualterm v1.0.4 h1:Z6IpERbRVlfB8WkOmtbHiDbBANU7cimRIof7mk9/PwM= @@ -12,9 +11,8 @@ github.com/chzyer/readline v1.5.1 h1:upd/6fQk4src78LMRzh5vItIt361/o4uq553V8B5sGI github.com/chzyer/readline v1.5.1/go.mod h1:Eh+b79XXUwfKfcPLepksvw2tcLE/Ct21YObkaSkeBlk= github.com/chzyer/test v1.0.0 h1:p3BQDXSxOhOG0P9z6/hGnII4LGiEPOYBhs8asl/fC04= github.com/chzyer/test v1.0.0/go.mod h1:2JlltgoNkt4TW/z9V/IzDdFaMTM2JPIi26O1pF38GC8= +github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d h1:U+s90UTSYgptZMwQh2aRr3LuazLJIa+Pg3Kc1ylSYVY= github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= -github.com/cpuguy83/go-md2man/v2 v2.0.4 h1:wfIWP927BUkWJb2NmU/kNDYIBTh/ziUX91+lVfRxZq4= -github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -23,11 +21,6 @@ github.com/denisbrodbeck/machineid v1.0.1/go.mod h1:dJUwb7PTidGDeYyUBmXZ2GphQBbj github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/kalafut/imohash v1.1.0 h1:Lldcmx0SXgMSoABB2WBD8mTgf0OlVnISn2Dyrfg2Ep8= github.com/kalafut/imohash v1.1.0/go.mod h1:6cn9lU0Sj8M4eu9UaQm1kR/5y3k/ayB68yntRhGloL4= -github.com/kr/pretty v0.2.1 h1:Fmg33tUaq4/8ym9TJN1x7sLJnHVwhP33CNkpYV/7rwI= -github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= -github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= -github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= -github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/magisterquis/connectproxy v0.0.0-20200725203833-3582e84f0c9b h1:xZ59n7Frzh8CwyfAapUZLSg+gXH5m63YEaFCMpDHhpI= github.com/magisterquis/connectproxy v0.0.0-20200725203833-3582e84f0c9b/go.mod h1:uDd4sYVYsqcxAB8j+Q7uhL6IJCs/r1kxib1HV4bgOMg= github.com/mattn/go-runewidth v0.0.16 h1:E5ScNMtiwvlvB5paMFdw9p4kSQzbXFikJ5SQO6TULQc= @@ -40,37 +33,32 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ= github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88= +github.com/russross/blackfriday/v2 v2.0.1 h1:lPqVAte+HuHNfhJ/0LC98ESWRz8afy9tM/0RK8m9o+Q= github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= -github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk= -github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06 h1:OkMGxebDjyw0ULyrTYWeN0UNCCkmCWfjPnIA2W6oviI= github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06/go.mod h1:+ePHsJ1keEjQtpvf9HHw0f4ZeJ0TLRsxhunSI2hYJSs= github.com/schollz/cli/v2 v2.2.1 h1:ou22Mj7ZPjrKz+8k2iDTWaHskEEV5NiAxGrdsCL36VU= github.com/schollz/cli/v2 v2.2.1/go.mod h1:My6bfphRLZUhZdlFUK8scAxMWHydE7k4s2ed2Dtnn+s= github.com/schollz/logger v1.2.0 h1:5WXfINRs3lEUTCZ7YXhj0uN+qukjizvITLm3Ca2m0Ho= github.com/schollz/logger v1.2.0/go.mod h1:P6F4/dGMGcx8wh+kG1zrNEd4vnNpEBY/mwEMd/vn6AM= -github.com/schollz/mnemonicode v1.0.2-0.20190421205639-63fa713ece0d h1:3zCjdgCJbo9Fot3UoqZkpGiDgT6Nf+iUnOsDEJQay+c= -github.com/schollz/mnemonicode v1.0.2-0.20190421205639-63fa713ece0d/go.mod h1:cl4UAOhUV0mkdjMj/QYaUZbZZdF8BnOqoz8rHMzwboY= github.com/schollz/pake/v3 v3.0.5 h1:MnZVdI987lkjln9BSx/zUb724TZISa2jbO+dPj6BvgQ= github.com/schollz/pake/v3 v3.0.5/go.mod h1:OGbG6htRwSKo6V8R5tg61ufpFmZM1b/PrrSp6g2ZLLc= github.com/schollz/peerdiscovery v1.7.4 h1:XTgdtdWxtrj+Z9mlCkvKkxawQLLwRL8ElssuLlIYP/4= github.com/schollz/peerdiscovery v1.7.4/go.mod h1:iKfn3SwRPiHYbyo6YCRjHNwRwDZM8ruJxzTBwO6g36c= github.com/schollz/progressbar/v3 v3.16.0 h1:+MbBim/cE9DqDb8UXRfLJ6RZdyDkXG1BDy/sWc5s0Mc= github.com/schollz/progressbar/v3 v3.16.0/go.mod h1:lLiKjKJ9/yzc9Q8jk+sVLfxWxgXKsktvUf6TO+4Y2nw= +github.com/shurcooL/sanitized_anchor_name v1.0.0 h1:PdmoCO6wvbs+7yrJyMORt4/BmY5IYyJwS/kOiWx8mHo= 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/spaolacci/murmur3 v1.1.0 h1:7c1g84S4BPRrfL5Xrdp6fOJ206sU9y293DDHaoy0bLI= -github.com/spaolacci/murmur3 v1.1.0/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= +github.com/tscholl2/siec v0.0.0-20210707234609-9bdfc483d499 h1:bPQ48TuiAuGTZDm54H2EV/2+eRRBHP61bKDkKSEPW4A= github.com/tscholl2/siec v0.0.0-20210707234609-9bdfc483d499/go.mod h1:KL9+ubr1JZdaKjgAaHr+tCytEncXBa1pR6FjbTsOJnw= -github.com/tscholl2/siec v0.0.0-20240310163802-c2c6f6198406 h1:sDWDZkwYqX0jvLWstKzFwh+pYhQNaVg65BgSkCP/f7U= -github.com/tscholl2/siec v0.0.0-20240310163802-c2c6f6198406/go.mod h1:KL9+ubr1JZdaKjgAaHr+tCytEncXBa1pR6FjbTsOJnw= +github.com/twmb/murmur3 v1.1.5 h1:i9OLS9fkuLzBXjt6dptlAEyk58fJsSTXbRg3SgVyqgk= github.com/twmb/murmur3 v1.1.5/go.mod h1:Qq/R7NUyOfr65zD+6Q5IHKsJLwP7exErjN6lyyq3OSQ= -github.com/twmb/murmur3 v1.1.8 h1:8Yt9taO/WN3l08xErzjeschgZU2QSrwm1kclYq+0aRg= -github.com/twmb/murmur3 v1.1.8/go.mod h1:Qq/R7NUyOfr65zD+6Q5IHKsJLwP7exErjN6lyyq3OSQ= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= @@ -137,8 +125,6 @@ golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI= -golang.org/x/text v0.18.0 h1:XvMDiNzPAl0jr17s6W9lcaIhGUfUORdGCNsuLmPG224= -golang.org/x/text v0.18.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= golang.org/x/time v0.6.0 h1:eTDhh4ZXt5Qf0augr54TN6suAUudPcawVZeIAPU7D4U= golang.org/x/time v0.6.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= @@ -148,9 +134,8 @@ golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58= golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= -gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= diff --git a/src/cli/cli.go b/src/cli/cli.go index 11fcf068..e36c2432 100644 --- a/src/cli/cli.go +++ b/src/cli/cli.go @@ -17,11 +17,11 @@ import ( "github.com/schollz/cli/v2" "github.com/schollz/croc/v10/src/comm" "github.com/schollz/croc/v10/src/croc" + "github.com/schollz/croc/v10/src/mnemonicode" "github.com/schollz/croc/v10/src/models" "github.com/schollz/croc/v10/src/tcp" "github.com/schollz/croc/v10/src/utils" log "github.com/schollz/logger" - "github.com/schollz/mnemonicode" "github.com/schollz/pake/v3" ) diff --git a/src/mnemonicode/mnemonicode.go b/src/mnemonicode/mnemonicode.go new file mode 100644 index 00000000..8813ac4d --- /dev/null +++ b/src/mnemonicode/mnemonicode.go @@ -0,0 +1,88 @@ +// From GitHub version/fork maintained by Stephen Paul Weber available at: +// https://github.com/singpolyma/mnemonicode +// +// Originally from: +// http://web.archive.org/web/20101031205747/http://www.tothink.com/mnemonic/ + +/* + Copyright (c) 2000 Oren Tirosh + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + THE SOFTWARE. +*/ + +package mnemonicode + +const base = 1626 + +// WordsRequired returns the number of words required to encode input +// data of length bytes using mnomonic encoding. +// +// Every four bytes of input is encoded into three words. If there +// is an extra one or two bytes they get an extra one or two words +// respectively. If there is an extra three bytes, they will be encoded +// into three words with the last word being one of a small set of very +// short words (only needed to encode the last 3 bits). +func WordsRequired(length int) int { + return ((length + 1) * 3) / 4 +} + +// EncodeWordList encodes src into mnemomic words which are appended to dst. +// The final wordlist is returned. +// There will be WordsRequired(len(src)) words appeneded. +func EncodeWordList(dst []string, src []byte) (result []string) { + if n := len(dst) + WordsRequired(len(src)); cap(dst) < n { + result = make([]string, len(dst), n) + copy(result, dst) + } else { + result = dst + } + + var x uint32 + for len(src) >= 4 { + x = uint32(src[0]) + x |= uint32(src[1]) << 8 + x |= uint32(src[2]) << 16 + x |= uint32(src[3]) << 24 + src = src[4:] + + i0 := int(x % base) + i1 := int(x/base) % base + i2 := int(x/base/base) % base + result = append(result, WordList[i0], WordList[i1], WordList[i2]) + } + if len(src) > 0 { + x = 0 + for i := len(src) - 1; i >= 0; i-- { + x <<= 8 + x |= uint32(src[i]) + } + i := int(x % base) + result = append(result, WordList[i]) + if len(src) >= 2 { + i = int(x/base) % base + result = append(result, WordList[i]) + } + if len(src) == 3 { + i = base + int(x/base/base)%7 + result = append(result, WordList[i]) + } + } + + return result +} diff --git a/src/mnemonicode/wordlist.go b/src/mnemonicode/wordlist.go new file mode 100644 index 00000000..a0ff1c2e --- /dev/null +++ b/src/mnemonicode/wordlist.go @@ -0,0 +1,318 @@ +// From GitHub version/fork maintained by Stephen Paul Weber available at: +// https://github.com/singpolyma/mnemonicode +// +// Originally from: +// http://web.archive.org/web/20101031205747/http://www.tothink.com/mnemonic/ + +/* +Copyright (c) 2000 Oren Tirosh + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. +*/ + +package mnemonicode + +// WordListVersion is the version of compiled in word list. +const WordListVersion = "0.7" + +var wordMap = make(map[string]int, len(WordList)) + +func init() { + for i, w := range WordList { + wordMap[w] = i + } +} + +const longestWord = 7 + +var WordList = []string{ + "academy", "acrobat", "active", "actor", "adam", "admiral", + "adrian", "africa", "agenda", "agent", "airline", "airport", + "aladdin", "alarm", "alaska", "albert", "albino", "album", + "alcohol", "alex", "algebra", "alibi", "alice", "alien", + "alpha", "alpine", "amadeus", "amanda", "amazon", "amber", + "america", "amigo", "analog", "anatomy", "angel", "animal", + "antenna", "antonio", "apollo", "april", "archive", "arctic", + "arizona", "arnold", "aroma", "arthur", "artist", "asia", + "aspect", "aspirin", "athena", "athlete", "atlas", "audio", + "august", "austria", "axiom", "aztec", "balance", "ballad", + "banana", "bandit", "banjo", "barcode", "baron", "basic", + "battery", "belgium", "berlin", "bermuda", "bernard", "bikini", + "binary", "bingo", "biology", "block", "blonde", "bonus", + "boris", "boston", "boxer", "brandy", "bravo", "brazil", + "bronze", "brown", "bruce", "bruno", "burger", "burma", + "cabinet", "cactus", "cafe", "cairo", "cake", "calypso", + "camel", "camera", "campus", "canada", "canal", "cannon", + "canoe", "cantina", "canvas", "canyon", "capital", "caramel", + "caravan", "carbon", "cargo", "carlo", "carol", "carpet", + "cartel", "casino", "castle", "castro", "catalog", "caviar", + "cecilia", "cement", "center", "century", "ceramic", "chamber", + "chance", "change", "chaos", "charlie", "charm", "charter", + "chef", "chemist", "cherry", "chess", "chicago", "chicken", + "chief", "china", "cigar", "cinema", "circus", "citizen", + "city", "clara", "classic", "claudia", "clean", "client", + "climax", "clinic", "clock", "club", "cobra", "coconut", + "cola", "collect", "colombo", "colony", "color", "combat", + "comedy", "comet", "command", "compact", "company", "complex", + "concept", "concert", "connect", "consul", "contact", "context", + "contour", "control", "convert", "copy", "corner", "corona", + "correct", "cosmos", "couple", "courage", "cowboy", "craft", + "crash", "credit", "cricket", "critic", "crown", "crystal", + "cuba", "culture", "dallas", "dance", "daniel", "david", + "decade", "decimal", "deliver", "delta", "deluxe", "demand", + "demo", "denmark", "derby", "design", "detect", "develop", + "diagram", "dialog", "diamond", "diana", "diego", "diesel", + "diet", "digital", "dilemma", "diploma", "direct", "disco", + "disney", "distant", "doctor", "dollar", "dominic", "domino", + "donald", "dragon", "drama", "dublin", "duet", "dynamic", + "east", "ecology", "economy", "edgar", "egypt", "elastic", + "elegant", "element", "elite", "elvis", "email", "energy", + "engine", "english", "episode", "equator", "escort", "ethnic", + "europe", "everest", "evident", "exact", "example", "exit", + "exotic", "export", "express", "extra", "fabric", "factor", + "falcon", "family", "fantasy", "fashion", "fiber", "fiction", + "fidel", "fiesta", "figure", "film", "filter", "final", + "finance", "finish", "finland", "flash", "florida", "flower", + "fluid", "flute", "focus", "ford", "forest", "formal", + "format", "formula", "fortune", "forum", "fragile", "france", + "frank", "friend", "frozen", "future", "gabriel", "galaxy", + "gallery", "gamma", "garage", "garden", "garlic", "gemini", + "general", "genetic", "genius", "germany", "global", "gloria", + "golf", "gondola", "gong", "good", "gordon", "gorilla", + "grand", "granite", "graph", "green", "group", "guide", + "guitar", "guru", "hand", "happy", "harbor", "harmony", + "harvard", "havana", "hawaii", "helena", "hello", "henry", + "hilton", "history", "horizon", "hotel", "human", "humor", + "icon", "idea", "igloo", "igor", "image", "impact", + "import", "index", "india", "indigo", "input", "insect", + "instant", "iris", "italian", "jacket", "jacob", "jaguar", + "janet", "japan", "jargon", "jazz", "jeep", "john", + "joker", "jordan", "jumbo", "june", "jungle", "junior", + "jupiter", "karate", "karma", "kayak", "kermit", "kilo", + "king", "koala", "korea", "labor", "lady", "lagoon", + "laptop", "laser", "latin", "lava", "lecture", "left", + "legal", "lemon", "level", "lexicon", "liberal", "libra", + "limbo", "limit", "linda", "linear", "lion", "liquid", + "liter", "little", "llama", "lobby", "lobster", "local", + "logic", "logo", "lola", "london", "lotus", "lucas", + "lunar", "machine", "macro", "madam", "madonna", "madrid", + "maestro", "magic", "magnet", "magnum", "major", "mama", + "mambo", "manager", "mango", "manila", "marco", "marina", + "market", "mars", "martin", "marvin", "master", "matrix", + "maximum", "media", "medical", "mega", "melody", "melon", + "memo", "mental", "mentor", "menu", "mercury", "message", + "metal", "meteor", "meter", "method", "metro", "mexico", + "miami", "micro", "million", "mineral", "minimum", "minus", + "minute", "miracle", "mirage", "miranda", "mister", "mixer", + "mobile", "model", "modem", "modern", "modular", "moment", + "monaco", "monica", "monitor", "mono", "monster", "montana", + "morgan", "motel", "motif", "motor", "mozart", "multi", + "museum", "music", "mustang", "natural", "neon", "nepal", + "neptune", "nerve", "neutral", "nevada", "news", "ninja", + "nirvana", "normal", "nova", "novel", "nuclear", "numeric", + "nylon", "oasis", "object", "observe", "ocean", "octopus", + "olivia", "olympic", "omega", "opera", "optic", "optimal", + "orange", "orbit", "organic", "orient", "origin", "orlando", + "oscar", "oxford", "oxygen", "ozone", "pablo", "pacific", + "pagoda", "palace", "pamela", "panama", "panda", "panel", + "panic", "paradox", "pardon", "paris", "parker", "parking", + "parody", "partner", "passage", "passive", "pasta", "pastel", + "patent", "patriot", "patrol", "patron", "pegasus", "pelican", + "penguin", "pepper", "percent", "perfect", "perfume", "period", + "permit", "person", "peru", "phone", "photo", "piano", + "picasso", "picnic", "picture", "pigment", "pilgrim", "pilot", + "pirate", "pixel", "pizza", "planet", "plasma", "plaster", + "plastic", "plaza", "pocket", "poem", "poetic", "poker", + "polaris", "police", "politic", "polo", "polygon", "pony", + "popcorn", "popular", "postage", "postal", "precise", "prefix", + "premium", "present", "price", "prince", "printer", "prism", + "private", "product", "profile", "program", "project", "protect", + "proton", "public", "pulse", "puma", "pyramid", "queen", + "radar", "radio", "random", "rapid", "rebel", "record", + "recycle", "reflex", "reform", "regard", "regular", "relax", + "report", "reptile", "reverse", "ricardo", "ringo", "ritual", + "robert", "robot", "rocket", "rodeo", "romeo", "royal", + "russian", "safari", "salad", "salami", "salmon", "salon", + "salute", "samba", "sandra", "santana", "sardine", "school", + "screen", "script", "second", "secret", "section", "segment", + "select", "seminar", "senator", "senior", "sensor", "serial", + "service", "sheriff", "shock", "sierra", "signal", "silicon", + "silver", "similar", "simon", "single", "siren", "slogan", + "social", "soda", "solar", "solid", "solo", "sonic", + "soviet", "special", "speed", "spiral", "spirit", "sport", + "static", "station", "status", "stereo", "stone", "stop", + "street", "strong", "student", "studio", "style", "subject", + "sultan", "super", "susan", "sushi", "suzuki", "switch", + "symbol", "system", "tactic", "tahiti", "talent", "tango", + "tarzan", "taxi", "telex", "tempo", "tennis", "texas", + "textile", "theory", "thermos", "tiger", "titanic", "tokyo", + "tomato", "topic", "tornado", "toronto", "torpedo", "total", + "totem", "tourist", "tractor", "traffic", "transit", "trapeze", + "travel", "tribal", "trick", "trident", "trilogy", "tripod", + "tropic", "trumpet", "tulip", "tuna", "turbo", "twist", + "ultra", "uniform", "union", "uranium", "vacuum", "valid", + "vampire", "vanilla", "vatican", "velvet", "ventura", "venus", + "vertigo", "veteran", "victor", "video", "vienna", "viking", + "village", "vincent", "violet", "violin", "virtual", "virus", + "visa", "vision", "visitor", "visual", "vitamin", "viva", + "vocal", "vodka", "volcano", "voltage", "volume", "voyage", + "water", "weekend", "welcome", "western", "window", "winter", + "wizard", "wolf", "world", "xray", "yankee", "yoga", + "yogurt", "yoyo", "zebra", "zero", "zigzag", "zipper", + "zodiac", "zoom", "abraham", "action", "address", "alabama", + "alfred", "almond", "ammonia", "analyze", "annual", "answer", + "apple", "arena", "armada", "arsenal", "atlanta", "atomic", + "avenue", "average", "bagel", "baker", "ballet", "bambino", + "bamboo", "barbara", "basket", "bazaar", "benefit", "bicycle", + "bishop", "blitz", "bonjour", "bottle", "bridge", "british", + "brother", "brush", "budget", "cabaret", "cadet", "candle", + "capitan", "capsule", "career", "cartoon", "channel", "chapter", + "cheese", "circle", "cobalt", "cockpit", "college", "compass", + "comrade", "condor", "crimson", "cyclone", "darwin", "declare", + "degree", "delete", "delphi", "denver", "desert", "divide", + "dolby", "domain", "domingo", "double", "drink", "driver", + "eagle", "earth", "echo", "eclipse", "editor", "educate", + "edward", "effect", "electra", "emerald", "emotion", "empire", + "empty", "escape", "eternal", "evening", "exhibit", "expand", + "explore", "extreme", "ferrari", "first", "flag", "folio", + "forget", "forward", "freedom", "fresh", "friday", "fuji", + "galileo", "garcia", "genesis", "gold", "gravity", "habitat", + "hamlet", "harlem", "helium", "holiday", "house", "hunter", + "ibiza", "iceberg", "imagine", "infant", "isotope", "jackson", + "jamaica", "jasmine", "java", "jessica", "judo", "kitchen", + "lazarus", "letter", "license", "lithium", "loyal", "lucky", + "magenta", "mailbox", "manual", "marble", "mary", "maxwell", + "mayor", "milk", "monarch", "monday", "money", "morning", + "mother", "mystery", "native", "nectar", "nelson", "network", + "next", "nikita", "nobel", "nobody", "nominal", "norway", + "nothing", "number", "october", "office", "oliver", "opinion", + "option", "order", "outside", "package", "pancake", "pandora", + "panther", "papa", "patient", "pattern", "pedro", "pencil", + "people", "phantom", "philips", "pioneer", "pluto", "podium", + "portal", "potato", "prize", "process", "protein", "proxy", + "pump", "pupil", "python", "quality", "quarter", "quiet", + "rabbit", "radical", "radius", "rainbow", "ralph", "ramirez", + "ravioli", "raymond", "respect", "respond", "result", "resume", + "retro", "richard", "right", "risk", "river", "roger", + "roman", "rondo", "sabrina", "salary", "salsa", "sample", + "samuel", "saturn", "savage", "scarlet", "scoop", "scorpio", + "scratch", "scroll", "sector", "serpent", "shadow", "shampoo", + "sharon", "sharp", "short", "shrink", "silence", "silk", + "simple", "slang", "smart", "smoke", "snake", "society", + "sonar", "sonata", "soprano", "source", "sparta", "sphere", + "spider", "sponsor", "spring", "acid", "adios", "agatha", + "alamo", "alert", "almanac", "aloha", "andrea", "anita", + "arcade", "aurora", "avalon", "baby", "baggage", "balloon", + "bank", "basil", "begin", "biscuit", "blue", "bombay", + "brain", "brenda", "brigade", "cable", "carmen", "cello", + "celtic", "chariot", "chrome", "citrus", "civil", "cloud", + "common", "compare", "cool", "copper", "coral", "crater", + "cubic", "cupid", "cycle", "depend", "door", "dream", + "dynasty", "edison", "edition", "enigma", "equal", "eric", + "event", "evita", "exodus", "extend", "famous", "farmer", + "food", "fossil", "frog", "fruit", "geneva", "gentle", + "george", "giant", "gilbert", "gossip", "gram", "greek", + "grille", "hammer", "harvest", "hazard", "heaven", "herbert", + "heroic", "hexagon", "husband", "immune", "inca", "inch", + "initial", "isabel", "ivory", "jason", "jerome", "joel", + "joshua", "journal", "judge", "juliet", "jump", "justice", + "kimono", "kinetic", "leonid", "lima", "maze", "medusa", + "member", "memphis", "michael", "miguel", "milan", "mile", + "miller", "mimic", "mimosa", "mission", "monkey", "moral", + "moses", "mouse", "nancy", "natasha", "nebula", "nickel", + "nina", "noise", "orchid", "oregano", "origami", "orinoco", + "orion", "othello", "paper", "paprika", "prelude", "prepare", + "pretend", "profit", "promise", "provide", "puzzle", "remote", + "repair", "reply", "rival", "riviera", "robin", "rose", + "rover", "rudolf", "saga", "sahara", "scholar", "shelter", + "ship", "shoe", "sigma", "sister", "sleep", "smile", + "spain", "spark", "split", "spray", "square", "stadium", + "star", "storm", "story", "strange", "stretch", "stuart", + "subway", "sugar", "sulfur", "summer", "survive", "sweet", + "swim", "table", "taboo", "target", "teacher", "telecom", + "temple", "tibet", "ticket", "tina", "today", "toga", + "tommy", "tower", "trivial", "tunnel", "turtle", "twin", + "uncle", "unicorn", "unique", "update", "valery", "vega", + "version", "voodoo", "warning", "william", "wonder", "year", + "yellow", "young", "absent", "absorb", "accent", "alfonso", + "alias", "ambient", "andy", "anvil", "appear", "apropos", + "archer", "ariel", "armor", "arrow", "austin", "avatar", + "axis", "baboon", "bahama", "bali", "balsa", "bazooka", + "beach", "beast", "beatles", "beauty", "before", "benny", + "betty", "between", "beyond", "billy", "bison", "blast", + "bless", "bogart", "bonanza", "book", "border", "brave", + "bread", "break", "broken", "bucket", "buenos", "buffalo", + "bundle", "button", "buzzer", "byte", "caesar", "camilla", + "canary", "candid", "carrot", "cave", "chant", "child", + "choice", "chris", "cipher", "clarion", "clark", "clever", + "cliff", "clone", "conan", "conduct", "congo", "content", + "costume", "cotton", "cover", "crack", "current", "danube", + "data", "decide", "desire", "detail", "dexter", "dinner", + "dispute", "donor", "druid", "drum", "easy", "eddie", + "enjoy", "enrico", "epoxy", "erosion", "except", "exile", + "explain", "fame", "fast", "father", "felix", "field", + "fiona", "fire", "fish", "flame", "flex", "flipper", + "float", "flood", "floor", "forbid", "forever", "fractal", + "frame", "freddie", "front", "fuel", "gallop", "game", + "garbo", "gate", "gibson", "ginger", "giraffe", "gizmo", + "glass", "goblin", "gopher", "grace", "gray", "gregory", + "grid", "griffin", "ground", "guest", "gustav", "gyro", + "hair", "halt", "harris", "heart", "heavy", "herman", + "hippie", "hobby", "honey", "hope", "horse", "hostel", + "hydro", "imitate", "info", "ingrid", "inside", "invent", + "invest", "invite", "iron", "ivan", "james", "jester", + "jimmy", "join", "joseph", "juice", "julius", "july", + "justin", "kansas", "karl", "kevin", "kiwi", "ladder", + "lake", "laura", "learn", "legacy", "legend", "lesson", + "life", "light", "list", "locate", "lopez", "lorenzo", + "love", "lunch", "malta", "mammal", "margo", "marion", + "mask", "match", "mayday", "meaning", "mercy", "middle", + "mike", "mirror", "modest", "morph", "morris", "nadia", + "nato", "navy", "needle", "neuron", "never", "newton", + "nice", "night", "nissan", "nitro", "nixon", "north", + "oberon", "octavia", "ohio", "olga", "open", "opus", + "orca", "oval", "owner", "page", "paint", "palma", + "parade", "parent", "parole", "paul", "peace", "pearl", + "perform", "phoenix", "phrase", "pierre", "pinball", "place", + "plate", "plato", "plume", "pogo", "point", "polite", + "polka", "poncho", "powder", "prague", "press", "presto", + "pretty", "prime", "promo", "quasi", "quest", "quick", + "quiz", "quota", "race", "rachel", "raja", "ranger", + "region", "remark", "rent", "reward", "rhino", "ribbon", + "rider", "road", "rodent", "round", "rubber", "ruby", + "rufus", "sabine", "saddle", "sailor", "saint", "salt", + "satire", "scale", "scuba", "season", "secure", "shake", + "shallow", "shannon", "shave", "shelf", "sherman", "shine", + "shirt", "side", "sinatra", "sincere", "size", "slalom", + "slow", "small", "snow", "sofia", "song", "sound", + "south", "speech", "spell", "spend", "spoon", "stage", + "stamp", "stand", "state", "stella", "stick", "sting", + "stock", "store", "sunday", "sunset", "support", "sweden", + "swing", "tape", "think", "thomas", "tictac", "time", + "toast", "tobacco", "tonight", "torch", "torso", "touch", + "toyota", "trade", "tribune", "trinity", "triton", "truck", + "trust", "type", "under", "unit", "urban", "urgent", + "user", "value", "vendor", "venice", "verona", "vibrate", + "virgo", "visible", "vista", "vital", "voice", "vortex", + "waiter", "watch", "wave", "weather", "wedding", "wheel", + "whiskey", "wisdom", "deal", "null", "nurse", "quebec", + "reserve", "reunion", "roof", "singer", "verbal", "amen", + "ego", "fax", "jet", "job", "rio", "ski", + "yes", +} diff --git a/src/utils/utils.go b/src/utils/utils.go index 6a61c8af..3aa588c8 100644 --- a/src/utils/utils.go +++ b/src/utils/utils.go @@ -24,10 +24,10 @@ import ( "github.com/cespare/xxhash" "github.com/kalafut/imohash" "github.com/minio/highwayhash" - "gortc.io/stun" + "github.com/schollz/croc/v10/src/mnemonicode" log "github.com/schollz/logger" - "github.com/schollz/mnemonicode" "github.com/schollz/progressbar/v3" + "gortc.io/stun" ) const NbPinNumbers = 4