Skip to content

Commit a182a2b

Browse files
committed
cmd/*: make Orchard Street Long Wordlist the default
Updates #1
1 parent efc6b74 commit a182a2b

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -128,11 +128,11 @@ $ twoproblems '[[:alnum:]]{5}-(?P<word>/5/-)-[[:punct:]]{5}'
128128
Two special captures (`(?P<name>)`) are supported:
129129
130130
1. `(?P<word>)`: A word from any of the supported wordlists. This can take up to
131-
three paramaters: the name of a supported wordlist ('orchard:medium' - default,
132-
'orchard:long', 'orchard:alpha, 'orchard:qwerty, 'sts10', 'eff:large' / 'eff',
133-
'eff:short1' or 'eff:short2'), an optional number to generate multiple words, and
134-
an optional separator to insert between the words (defaults to a space), each
135-
parameter is separated by a '/'.
131+
three paramaters: the name of a supported wordlist ('orchard:medium',
132+
'orchard:long' - default, 'orchard:alpha, 'orchard:qwerty, 'sts10',
133+
'eff:large' / 'eff', 'eff:short1' or 'eff:short2'), an optional number to generate
134+
multiple words, and an optional separator to insert between the words (defaults to
135+
a space), each parameter is separated by a '/'.
136136
1. `(?P<emoji>)`: A Unicode 15.0 emoji returned from `Emoji15`. This can take a number
137137
to generate multiple emoji.
138138

cmd/passphrase/passphrase.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ func main() {
3636
}
3737

3838
func main1() error {
39-
list := flag.String("l", "orchard:medium",
39+
list := flag.String("l", "orchard:long",
4040
"the wordlist to use; valid options are orchard:medium, orchard:long, orchard:alpha, "+
4141
"orchard:qwerty, sts10, eff:large / eff, eff:short1 and eff:short2")
4242
count := flag.Int("n", 6, "the number of words in the generated password")

cmd/twoproblems/twoproblems.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,14 +65,14 @@ func main1() error {
6565
func wordlist(sr *syntax.Regexp) (passit.Generator, error) {
6666
switch sr.Sub[0].Op {
6767
case syntax.OpEmptyMatch:
68-
return passit.OrchardStreetMedium, nil
68+
return passit.OrchardStreetLong, nil
6969
case syntax.OpLiteral:
7070
name, rest, more := strings.Cut(string(sr.Sub[0].Rune), "/")
7171
name = strings.ToLower(name)
7272

7373
gen := wordlists.NameToGenerator(name)
7474
if gen == nil && name == "" {
75-
gen = passit.OrchardStreetMedium
75+
gen = passit.OrchardStreetLong
7676
}
7777
if gen == nil {
7878
return nil, fmt.Errorf("twoproblems: unsupported wordlist %q", name)

0 commit comments

Comments
 (0)