From 610eef411fdad8aa6306ed5afe981e80c32c8177 Mon Sep 17 00:00:00 2001
From: Yishi Lin <yishilin14@gmail.com>
Date: Sun, 23 Feb 2020 03:48:10 +0800
Subject: [PATCH] Add eff short wordlist

---
 .../Assets.xcassets/Wordlist/Contents.json    |    6 +
 .../eff_long_wordlist.dataset/Contents.json   |   12 +
 .../eff_long_wordlist.txt}                    |    0
 .../eff_short_wordlist.dataset}/Contents.json |    2 +-
 .../eff_short_wordlist.txt                    | 1296 +++++++++++++++++
 passKit/Helpers/PasswordGeneratorFlavor.swift |   15 +-
 6 files changed, 1326 insertions(+), 5 deletions(-)
 create mode 100644 passKit/Assets.xcassets/Wordlist/Contents.json
 create mode 100644 passKit/Assets.xcassets/Wordlist/eff_long_wordlist.dataset/Contents.json
 rename passKit/Assets.xcassets/{WordLists.dataset/EN_wordlist.txt => Wordlist/eff_long_wordlist.dataset/eff_long_wordlist.txt} (100%)
 rename passKit/Assets.xcassets/{WordLists.dataset => Wordlist/eff_short_wordlist.dataset}/Contents.json (79%)
 create mode 100644 passKit/Assets.xcassets/Wordlist/eff_short_wordlist.dataset/eff_short_wordlist.txt

diff --git a/passKit/Assets.xcassets/Wordlist/Contents.json b/passKit/Assets.xcassets/Wordlist/Contents.json
new file mode 100644
index 0000000..da4a164
--- /dev/null
+++ b/passKit/Assets.xcassets/Wordlist/Contents.json
@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/passKit/Assets.xcassets/Wordlist/eff_long_wordlist.dataset/Contents.json b/passKit/Assets.xcassets/Wordlist/eff_long_wordlist.dataset/Contents.json
new file mode 100644
index 0000000..fe7a3f5
--- /dev/null
+++ b/passKit/Assets.xcassets/Wordlist/eff_long_wordlist.dataset/Contents.json
@@ -0,0 +1,12 @@
+{
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  },
+  "data" : [
+    {
+      "idiom" : "universal",
+      "filename" : "eff_long_wordlist.txt"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/passKit/Assets.xcassets/WordLists.dataset/EN_wordlist.txt b/passKit/Assets.xcassets/Wordlist/eff_long_wordlist.dataset/eff_long_wordlist.txt
similarity index 100%
rename from passKit/Assets.xcassets/WordLists.dataset/EN_wordlist.txt
rename to passKit/Assets.xcassets/Wordlist/eff_long_wordlist.dataset/eff_long_wordlist.txt
diff --git a/passKit/Assets.xcassets/WordLists.dataset/Contents.json b/passKit/Assets.xcassets/Wordlist/eff_short_wordlist.dataset/Contents.json
similarity index 79%
rename from passKit/Assets.xcassets/WordLists.dataset/Contents.json
rename to passKit/Assets.xcassets/Wordlist/eff_short_wordlist.dataset/Contents.json
index 181c891..de8343e 100644
--- a/passKit/Assets.xcassets/WordLists.dataset/Contents.json
+++ b/passKit/Assets.xcassets/Wordlist/eff_short_wordlist.dataset/Contents.json
@@ -6,7 +6,7 @@
   "data" : [
     {
       "idiom" : "universal",
-      "filename" : "EN_wordlist.txt",
+      "filename" : "eff_short_wordlist.txt",
       "universal-type-identifier" : "public.plain-text"
     }
   ]
diff --git a/passKit/Assets.xcassets/Wordlist/eff_short_wordlist.dataset/eff_short_wordlist.txt b/passKit/Assets.xcassets/Wordlist/eff_short_wordlist.dataset/eff_short_wordlist.txt
new file mode 100644
index 0000000..3a22c2f
--- /dev/null
+++ b/passKit/Assets.xcassets/Wordlist/eff_short_wordlist.dataset/eff_short_wordlist.txt
@@ -0,0 +1,1296 @@
+acid
+acorn
+acre
+acts
+afar
+affix
+aged
+agent
+agile
+aging
+agony
+ahead
+aide
+aids
+aim
+ajar
+alarm
+alias
+alibi
+alien
+alike
+alive
+aloe
+aloft
+aloha
+alone
+amend
+amino
+ample
+amuse
+angel
+anger
+angle
+ankle
+apple
+april
+apron
+aqua
+area
+arena
+argue
+arise
+armed
+armor
+army
+aroma
+array
+arson
+art
+ashen
+ashes
+atlas
+atom
+attic
+audio
+avert
+avoid
+awake
+award
+awoke
+axis
+bacon
+badge
+bagel
+baggy
+baked
+baker
+balmy
+banjo
+barge
+barn
+bash
+basil
+bask
+batch
+bath
+baton
+bats
+blade
+blank
+blast
+blaze
+bleak
+blend
+bless
+blimp
+blink
+bloat
+blob
+blog
+blot
+blunt
+blurt
+blush
+boast
+boat
+body
+boil
+bok
+bolt
+boned
+boney
+bonus
+bony
+book
+booth
+boots
+boss
+botch
+both
+boxer
+breed
+bribe
+brick
+bride
+brim
+bring
+brink
+brisk
+broad
+broil
+broke
+brook
+broom
+brush
+buck
+bud
+buggy
+bulge
+bulk
+bully
+bunch
+bunny
+bunt
+bush
+bust
+busy
+buzz
+cable
+cache
+cadet
+cage
+cake
+calm
+cameo
+canal
+candy
+cane
+canon
+cape
+card
+cargo
+carol
+carry
+carve
+case
+cash
+cause
+cedar
+chain
+chair
+chant
+chaos
+charm
+chase
+cheek
+cheer
+chef
+chess
+chest
+chew
+chief
+chili
+chill
+chip
+chomp
+chop
+chow
+chuck
+chump
+chunk
+churn
+chute
+cider
+cinch
+city
+civic
+civil
+clad
+claim
+clamp
+clap
+clash
+clasp
+class
+claw
+clay
+clean
+clear
+cleat
+cleft
+clerk
+click
+cling
+clink
+clip
+cloak
+clock
+clone
+cloth
+cloud
+clump
+coach
+coast
+coat
+cod
+coil
+coke
+cola
+cold
+colt
+coma
+come
+comic
+comma
+cone
+cope
+copy
+coral
+cork
+cost
+cot
+couch
+cough
+cover
+cozy
+craft
+cramp
+crane
+crank
+crate
+crave
+crawl
+crazy
+creme
+crepe
+crept
+crib
+cried
+crisp
+crook
+crop
+cross
+crowd
+crown
+crumb
+crush
+crust
+cub
+cult
+cupid
+cure
+curl
+curry
+curse
+curve
+curvy
+cushy
+cut
+cycle
+dab
+dad
+daily
+dairy
+daisy
+dance
+dandy
+darn
+dart
+dash
+data
+date
+dawn
+deaf
+deal
+dean
+debit
+debt
+debug
+decaf
+decal
+decay
+deck
+decor
+decoy
+deed
+delay
+denim
+dense
+dent
+depth
+derby
+desk
+dial
+diary
+dice
+dig
+dill
+dime
+dimly
+diner
+dingy
+disco
+dish
+disk
+ditch
+ditzy
+dizzy
+dock
+dodge
+doing
+doll
+dome
+donor
+donut
+dose
+dot
+dove
+down
+dowry
+doze
+drab
+drama
+drank
+draw
+dress
+dried
+drift
+drill
+drive
+drone
+droop
+drove
+drown
+drum
+dry
+duck
+duct
+dude
+dug
+duke
+duo
+dusk
+dust
+duty
+dwarf
+dwell
+eagle
+early
+earth
+easel
+east
+eaten
+eats
+ebay
+ebony
+ebook
+echo
+edge
+eel
+eject
+elbow
+elder
+elf
+elk
+elm
+elope
+elude
+elves
+email
+emit
+empty
+emu
+enter
+entry
+envoy
+equal
+erase
+error
+erupt
+essay
+etch
+evade
+even
+evict
+evil
+evoke
+exact
+exit
+fable
+faced
+fact
+fade
+fall
+FALSE
+fancy
+fang
+fax
+feast
+feed
+femur
+fence
+fend
+ferry
+fetal
+fetch
+fever
+fiber
+fifth
+fifty
+film
+filth
+final
+finch
+fit
+five
+flag
+flaky
+flame
+flap
+flask
+fled
+flick
+fling
+flint
+flip
+flirt
+float
+flock
+flop
+floss
+flyer
+foam
+foe
+fog
+foil
+folic
+folk
+food
+fool
+found
+fox
+foyer
+frail
+frame
+fray
+fresh
+fried
+frill
+frisk
+from
+front
+frost
+froth
+frown
+froze
+fruit
+gag
+gains
+gala
+game
+gap
+gas
+gave
+gear
+gecko
+geek
+gem
+genre
+gift
+gig
+gills
+given
+giver
+glad
+glass
+glide
+gloss
+glove
+glow
+glue
+goal
+going
+golf
+gong
+good
+gooey
+goofy
+gore
+gown
+grab
+grain
+grant
+grape
+graph
+grasp
+grass
+grave
+gravy
+gray
+green
+greet
+grew
+grid
+grief
+grill
+grip
+grit
+groom
+grope
+growl
+grub
+grunt
+guide
+gulf
+gulp
+gummy
+guru
+gush
+gut
+guy
+habit
+half
+halo
+halt
+happy
+harm
+hash
+hasty
+hatch
+hate
+haven
+hazel
+hazy
+heap
+heat
+heave
+hedge
+hefty
+help
+herbs
+hers
+hub
+hug
+hula
+hull
+human
+humid
+hump
+hung
+hunk
+hunt
+hurry
+hurt
+hush
+hut
+ice
+icing
+icon
+icy
+igloo
+image
+ion
+iron
+islam
+issue
+item
+ivory
+ivy
+jab
+jam
+jaws
+jazz
+jeep
+jelly
+jet
+jiffy
+job
+jog
+jolly
+jolt
+jot
+joy
+judge
+juice
+juicy
+july
+jumbo
+jump
+junky
+juror
+jury
+keep
+keg
+kept
+kick
+kilt
+king
+kite
+kitty
+kiwi
+knee
+knelt
+koala
+kung
+ladle
+lady
+lair
+lake
+lance
+land
+lapel
+large
+lash
+lasso
+last
+latch
+late
+lazy
+left
+legal
+lemon
+lend
+lens
+lent
+level
+lever
+lid
+life
+lift
+lilac
+lily
+limb
+limes
+line
+lint
+lion
+lip
+list
+lived
+liver
+lunar
+lunch
+lung
+lurch
+lure
+lurk
+lying
+lyric
+mace
+maker
+malt
+mama
+mango
+manor
+many
+map
+march
+mardi
+marry
+mash
+match
+mate
+math
+moan
+mocha
+moist
+mold
+mom
+moody
+mop
+morse
+most
+motor
+motto
+mount
+mouse
+mousy
+mouth
+move
+movie
+mower
+mud
+mug
+mulch
+mule
+mull
+mumbo
+mummy
+mural
+muse
+music
+musky
+mute
+nacho
+nag
+nail
+name
+nanny
+nap
+navy
+near
+neat
+neon
+nerd
+nest
+net
+next
+niece
+ninth
+nutty
+oak
+oasis
+oat
+ocean
+oil
+old
+olive
+omen
+onion
+only
+ooze
+opal
+open
+opera
+opt
+otter
+ouch
+ounce
+outer
+oval
+oven
+owl
+ozone
+pace
+pagan
+pager
+palm
+panda
+panic
+pants
+panty
+paper
+park
+party
+pasta
+patch
+path
+patio
+payer
+pecan
+penny
+pep
+perch
+perky
+perm
+pest
+petal
+petri
+petty
+photo
+plank
+plant
+plaza
+plead
+plot
+plow
+pluck
+plug
+plus
+poach
+pod
+poem
+poet
+pogo
+point
+poise
+poker
+polar
+polio
+polka
+polo
+pond
+pony
+poppy
+pork
+poser
+pouch
+pound
+pout
+power
+prank
+press
+print
+prior
+prism
+prize
+probe
+prong
+proof
+props
+prude
+prune
+pry
+pug
+pull
+pulp
+pulse
+puma
+punch
+punk
+pupil
+puppy
+purr
+purse
+push
+putt
+quack
+quake
+query
+quiet
+quill
+quilt
+quit
+quota
+quote
+rabid
+race
+rack
+radar
+radio
+raft
+rage
+raid
+rail
+rake
+rally
+ramp
+ranch
+range
+rank
+rant
+rash
+raven
+reach
+react
+ream
+rebel
+recap
+relax
+relay
+relic
+remix
+repay
+repel
+reply
+rerun
+reset
+rhyme
+rice
+rich
+ride
+rigid
+rigor
+rinse
+riot
+ripen
+rise
+risk
+ritzy
+rival
+river
+roast
+robe
+robin
+rock
+rogue
+roman
+romp
+rope
+rover
+royal
+ruby
+rug
+ruin
+rule
+runny
+rush
+rust
+rut
+sadly
+sage
+said
+saint
+salad
+salon
+salsa
+salt
+same
+sandy
+santa
+satin
+sauna
+saved
+savor
+sax
+say
+scale
+scam
+scan
+scare
+scarf
+scary
+scoff
+scold
+scoop
+scoot
+scope
+score
+scorn
+scout
+scowl
+scrap
+scrub
+scuba
+scuff
+sect
+sedan
+self
+send
+sepia
+serve
+set
+seven
+shack
+shade
+shady
+shaft
+shaky
+sham
+shape
+share
+sharp
+shed
+sheep
+sheet
+shelf
+shell
+shine
+shiny
+ship
+shirt
+shock
+shop
+shore
+shout
+shove
+shown
+showy
+shred
+shrug
+shun
+shush
+shut
+shy
+sift
+silk
+silly
+silo
+sip
+siren
+sixth
+size
+skate
+skew
+skid
+skier
+skies
+skip
+skirt
+skit
+sky
+slab
+slack
+slain
+slam
+slang
+slash
+slate
+slaw
+sled
+sleek
+sleep
+sleet
+slept
+slice
+slick
+slimy
+sling
+slip
+slit
+slob
+slot
+slug
+slum
+slurp
+slush
+small
+smash
+smell
+smile
+smirk
+smog
+snack
+snap
+snare
+snarl
+sneak
+sneer
+sniff
+snore
+snort
+snout
+snowy
+snub
+snuff
+speak
+speed
+spend
+spent
+spew
+spied
+spill
+spiny
+spoil
+spoke
+spoof
+spool
+spoon
+sport
+spot
+spout
+spray
+spree
+spur
+squad
+squat
+squid
+stack
+staff
+stage
+stain
+stall
+stamp
+stand
+stank
+stark
+start
+stash
+state
+stays
+steam
+steep
+stem
+step
+stew
+stick
+sting
+stir
+stock
+stole
+stomp
+stony
+stood
+stool
+stoop
+stop
+storm
+stout
+stove
+straw
+stray
+strut
+stuck
+stud
+stuff
+stump
+stung
+stunt
+suds
+sugar
+sulk
+surf
+sushi
+swab
+swan
+swarm
+sway
+swear
+sweat
+sweep
+swell
+swept
+swim
+swing
+swipe
+swirl
+swoop
+swore
+syrup
+tacky
+taco
+tag
+take
+tall
+talon
+tamer
+tank
+taper
+taps
+tarot
+tart
+task
+taste
+tasty
+taunt
+thank
+thaw
+theft
+theme
+thigh
+thing
+think
+thong
+thorn
+those
+throb
+thud
+thumb
+thump
+thus
+tiara
+tidal
+tidy
+tiger
+tile
+tilt
+tint
+tiny
+trace
+track
+trade
+train
+trait
+trap
+trash
+tray
+treat
+tree
+trek
+trend
+trial
+tribe
+trick
+trio
+trout
+truce
+truck
+trump
+trunk
+try
+tug
+tulip
+tummy
+turf
+tusk
+tutor
+tutu
+tux
+tweak
+tweet
+twice
+twine
+twins
+twirl
+twist
+uncle
+uncut
+undo
+unify
+union
+unit
+untie
+upon
+upper
+urban
+used
+user
+usher
+utter
+value
+vapor
+vegan
+venue
+verse
+vest
+veto
+vice
+video
+view
+viral
+virus
+visa
+visor
+vixen
+vocal
+voice
+void
+volt
+voter
+vowel
+wad
+wafer
+wager
+wages
+wagon
+wake
+walk
+wand
+wasp
+watch
+water
+wavy
+wheat
+whiff
+whole
+whoop
+wick
+widen
+widow
+width
+wife
+wifi
+wilt
+wimp
+wind
+wing
+wink
+wipe
+wired
+wiry
+wise
+wish
+wispy
+wok
+wolf
+womb
+wool
+woozy
+word
+work
+worry
+wound
+woven
+wrath
+wreck
+wrist
+xerox
+yahoo
+yam
+yard
+year
+yeast
+yelp
+yield
+yo-yo
+yodel
+yoga
+yoyo
+yummy
+zebra
+zero
+zesty
+zippy
+zone
+zoom
\ No newline at end of file
diff --git a/passKit/Helpers/PasswordGeneratorFlavor.swift b/passKit/Helpers/PasswordGeneratorFlavor.swift
index eb43c55..362872e 100644
--- a/passKit/Helpers/PasswordGeneratorFlavor.swift
+++ b/passKit/Helpers/PasswordGeneratorFlavor.swift
@@ -58,11 +58,18 @@ public enum PasswordGeneratorFlavor: String {
     private static func generateXKCD(length: Int) -> String {
         // Get the word list
         let bundle = Bundle(identifier: Globals.passKitBundleIdentifier)!
-        guard let asset = NSDataAsset(name: "WordLists", bundle: bundle),
-            let data = String(data: asset.data, encoding: .utf8) else {
-                return ""
+        let wordlistNames = [
+            "eff_long_wordlist",
+            "eff_short_wordlist"
+        ]
+        let data = wordlistNames.map{ name -> String in
+            guard let asset = NSDataAsset(name: name, bundle: bundle),
+                let data = String(data: asset.data, encoding: .utf8) else {
+                    return ""
+            }
+            return data
         }
-        let words = data.splitByNewline()
+        let words = data.joined(separator: "\n").splitByNewline()
         
         // Generate a password
         let delimiters = "0123456789!@#$%^&*_+-="