From c72432d640eebfd27e393b6c5e85507ee881936f Mon Sep 17 00:00:00 2001 From: Jaromil Date: Mon, 13 May 2024 00:31:07 +0200 Subject: [PATCH] fix cloakify to work easily and update documentation a few changes needed to be adjusted and manpage updated, now we also ship cloakify ciphers into extras, a link is left to original repo. --- doc/tomb.1 | 23 +-- extras/cloak/Makefile | 5 + extras/cloak/README.md | 3 + extras/cloak/ciphers/amphibians | 66 +++++++ extras/cloak/ciphers/belgianBeers | 66 +++++++ extras/cloak/ciphers/desserts | 107 +++++++++++ extras/cloak/ciphers/dessertsArabic | 100 ++++++++++ extras/cloak/ciphers/dessertsChinese | 94 +++++++++ extras/cloak/ciphers/dessertsHindi | 84 +++++++++ extras/cloak/ciphers/dessertsPersian | 92 +++++++++ extras/cloak/ciphers/dessertsRussian | 90 +++++++++ extras/cloak/ciphers/dessertsSwedishChef | 104 ++++++++++ extras/cloak/ciphers/dessertsThai | 86 +++++++++ extras/cloak/ciphers/emoji | 70 +++++++ extras/cloak/ciphers/evadeAV | 65 +++++++ extras/cloak/ciphers/geoCoordsWorldCapitals | 199 ++++++++++++++++++++ extras/cloak/ciphers/geocache | 82 ++++++++ extras/cloak/ciphers/hashesMD5 | 113 +++++++++++ extras/cloak/ciphers/ipAddressesTop100 | 77 ++++++++ extras/cloak/ciphers/pokemonGo | 76 ++++++++ extras/cloak/ciphers/rickrollYoutube | 67 +++++++ extras/cloak/ciphers/skiResorts | 68 +++++++ extras/cloak/ciphers/starTrek | 147 +++++++++++++++ extras/cloak/ciphers/statusCodes | 77 ++++++++ extras/cloak/ciphers/topWebsites | 71 +++++++ extras/cloak/ciphers/worldBeaches | 100 ++++++++++ extras/cloak/ciphers/worldFootballTeams | 100 ++++++++++ extras/cloak/cloakify.py | 111 +++++++++++ extras/cloak/decloakify.py | 84 +++++++++ extras/test/80_steganography.sh | 4 +- extras/test/setup | 2 +- tomb | 15 +- 32 files changed, 2427 insertions(+), 21 deletions(-) create mode 100644 extras/cloak/Makefile create mode 100644 extras/cloak/README.md create mode 100644 extras/cloak/ciphers/amphibians create mode 100644 extras/cloak/ciphers/belgianBeers create mode 100644 extras/cloak/ciphers/desserts create mode 100644 extras/cloak/ciphers/dessertsArabic create mode 100644 extras/cloak/ciphers/dessertsChinese create mode 100644 extras/cloak/ciphers/dessertsHindi create mode 100644 extras/cloak/ciphers/dessertsPersian create mode 100644 extras/cloak/ciphers/dessertsRussian create mode 100644 extras/cloak/ciphers/dessertsSwedishChef create mode 100644 extras/cloak/ciphers/dessertsThai create mode 100644 extras/cloak/ciphers/emoji create mode 100644 extras/cloak/ciphers/evadeAV create mode 100644 extras/cloak/ciphers/geoCoordsWorldCapitals create mode 100644 extras/cloak/ciphers/geocache create mode 100644 extras/cloak/ciphers/hashesMD5 create mode 100644 extras/cloak/ciphers/ipAddressesTop100 create mode 100644 extras/cloak/ciphers/pokemonGo create mode 100644 extras/cloak/ciphers/rickrollYoutube create mode 100644 extras/cloak/ciphers/skiResorts create mode 100644 extras/cloak/ciphers/starTrek create mode 100644 extras/cloak/ciphers/statusCodes create mode 100644 extras/cloak/ciphers/topWebsites create mode 100644 extras/cloak/ciphers/worldBeaches create mode 100644 extras/cloak/ciphers/worldFootballTeams create mode 100644 extras/cloak/cloakify.py create mode 100644 extras/cloak/decloakify.py diff --git a/doc/tomb.1 b/doc/tomb.1 index 602c1ea..767688c 100644 --- a/doc/tomb.1 +++ b/doc/tomb.1 @@ -219,22 +219,19 @@ key is buried in any image or not. .B .IP "cloak" -Hides a tomb key (\fI-k\fR) inside a \fIlong plain-text file\fR (first -argument) using \fIsteganography\fR: the text will change in a way -that can hardly be noticed by human eye and hardly detected by data -analysis. This option is useful to backup tomb keys in unsuspected -places; it depends from the availability of \fIcloakify\fR and -consequently \fIpython2\fR. This function does not support asymmetric -encryption using the \fI-g\fR flag. +Cloaks a tomb key (\fI-k\fR) disguising it as a text file using a +cipher from \fIextras/cloak/ciphers\fR (second argument) using +\fIcloakify\fR. This option is useful to backup tomb keys in +unsuspected places; it needs \fIextras/cloak\fR installed and +\fIpython3\fR. .B .IP "uncloak" -This command recovers from long plain-text files the keys that were -previously hidden into them using \fIcloak\fR. Cloak requires a key -filename (\fI-k\fR) and a \fIplain-text\fR file (first argument) known -to be containing a key. If the right key password is given, the key -will be exhumed. If the password is not known, it is quite hard to -verify if a key is buried in a text or not. +Recovers a tomb key from a cloaked text file. Uncloak requires a text +file (first argument), a cipher file (second argument) and optionally +an output file (third argument). If the first two parameters are +correct then the output will be a valid tomb key file restored from +cloak. .SH OPTIONS .B diff --git a/extras/cloak/Makefile b/extras/cloak/Makefile new file mode 100644 index 0000000..740e37c --- /dev/null +++ b/extras/cloak/Makefile @@ -0,0 +1,5 @@ +PREFIX ?= /usr/local + +install: + install -Dm755 cloakify.py ${DESTDIR}${PREFIX}/bin/cloakify + install -Dm755 decloakify.py ${DESTDIR}${PREFIX}/bin/decloakify diff --git a/extras/cloak/README.md b/extras/cloak/README.md new file mode 100644 index 0000000..5026ca5 --- /dev/null +++ b/extras/cloak/README.md @@ -0,0 +1,3 @@ +# Cloakify steganography into text files + +Original repo: https://github.com/asrabon/Cloakify-3 diff --git a/extras/cloak/ciphers/amphibians b/extras/cloak/ciphers/amphibians new file mode 100644 index 0000000..91e8b3b --- /dev/null +++ b/extras/cloak/ciphers/amphibians @@ -0,0 +1,66 @@ +Allophrynidae +Pipidae +Dicroglossidae +Myobatrachidae +Mavortium +Indotyphlidae +Elongatus +Croceater +Xanthoptica +Telmatobiidae +Arthroleptidae +Phrynobatrachidae +Hynobiidae +Rivularis +Torosa +Ranidae +Leptodactylidae +Dendrobatidae +Alsodidae +Eleutherodactylidae +Bufonidae +Craugastoridae +Ambystomatidae +Hylodidae +Croceum +Sierrae +Ambystoma +Micrixalidae +Nyctibatrachidae +Taricha +Typhlonectidae +Attenuatus +Brachycephalidae +Dicamptodon +Platycephalus +Ichthyophiidae +Centrolenidae +Plethodontidae +Oregonensis +Hyperoliidae +Batrachoseps +Hylidae +Rhacophoridae +Diabolicus +Ensatina +Gavilanensis +Nigriventris +Californiense +Rhyacotritonidae +Salamandridae +Altasierrae +Plethodon +Megophryidae +Sigillatum +Variegatus +Tenebrosus +Microhylidae +Pacificus +Odontobatrachidae +Ceratobatrachidae +Odontophrynidae +Strabomantidae +Mantellidae +Hydromantes +Siphonopidae +Pyxicephalidae diff --git a/extras/cloak/ciphers/belgianBeers b/extras/cloak/ciphers/belgianBeers new file mode 100644 index 0000000..d980721 --- /dev/null +++ b/extras/cloak/ciphers/belgianBeers @@ -0,0 +1,66 @@ +Nondedju +St. Paul Double +Lesage Dubbel +La Namuroise +Saint-Monon Ambrée +Belle-Vue Kriek Classique +Floris Framboise +Corsendonk Triple 11.11.11 +Keizer Karel Robijn Rood +Waase Wolf +Horst bier +Morpheus Tripel +Mageleno +Gordon Finest Copper +St. Benoit Blonde +Waterloo Tripel 7 Blond +Totentrekker +Molse Tripel +Geuze Mariage Parfait +Quest +Limerick +Buffalo Bitter +Mongozo Palmnut +La Waterlootoise +Serafijn Tripel +Lindemans Apple +Sint-Gummarus Tripel +Steendonk +Chimay Wit +Podge Oak Aged Stout +Liefmans Frambozenbier +Louwaege Faro +Ypres +Hapkin +Affligem 950 Cuvee +Caulier Brune +Hoppe +Joseph +Florilège de Rose +Saison de Dottignies +Shark Pants +Pikkeling Tripel +Den Twaalf +Antiek Blond +Belgoo Luppoo +Cambrinus +Adelardus +La Rulles Blonde +Kapel van Viven Blond +Montagnarde Altitude 6 +Ramée Triple Blond +Abbay d'Aulne Triple Blonde +'t Smisje Calva Reserva +De Koninck Winter +Holger +Zonderik 100 +Elliot Brew +Abbay d'Aulne Val de Sambre +Sur-les-Bois Blonde +Schaarbeekse Oude Kriek 3 Fonteinen +Lustem +Rodenbach +Vossen met de Meynen Blond +Xenophon’s Wine +Westhoek XX +Brussels Fruit Beer "Red Fruit" diff --git a/extras/cloak/ciphers/desserts b/extras/cloak/ciphers/desserts new file mode 100644 index 0000000..b83f10a --- /dev/null +++ b/extras/cloak/ciphers/desserts @@ -0,0 +1,107 @@ +honey +jelly +lollipop +spumoni +milkshake +shortcake +souffle +flower +fondant +crunch +pineapple +marionberry +lime +pudding +sugar +caramel +granita +zest +brittle +liquer +bun +toffee +ginger +custard +cookie +sucker +pistachio +meringue +eggs +peach +buttermilk +turnover +biscuits +turtle +puffs +doughnut +apricot +nutmeg +gingerbread +cherry +truffle +turnovers +licorice +mousse +muffins +raspberry +sorbet +streusel +candy +torte +syrup +terrine +curd +hazelnut +brownie +strawberries +blueberry +coconut +butterscotch +cookies +huckleberry +icing +walnut +pie +snickerdoodles +cannoli +marzipan +cake +compote +bonbon +glaze +flan +cane +foster +sherbet +ganache +cream +buttercream +jam +cobbler +tirimisu +creme +cupcake +cinnamon +mint +vanilla +éclair +taffy +orange +almond +rhubarb +pastry +brulee +lemon +cheesecake +chocolate +donut +sundae +peach pie +shortbread +frosting +parfaits +blackberry +popsicle +confection +crepe +macaroon diff --git a/extras/cloak/ciphers/dessertsArabic b/extras/cloak/ciphers/dessertsArabic new file mode 100644 index 0000000..d3642b1 --- /dev/null +++ b/extras/cloak/ciphers/dessertsArabic @@ -0,0 +1,100 @@ +سلحفاة +كاب كيك +ترين +معجنات +مرزبانية حلوى لوز وسكر +اللبن المخفوق +مخيض اللبن +كعكة فواكه +القاناش +مصاصة +ايكلير +زهرة +أقراص سكرية +دوران +بروليه +عرق السوس +المصاصة +بقلمي +مشمش +نفث +الإسكافي +تبرع +تيريميسو +كلس +تلذذ +.توت +لوز +كعكة الغريبة +فراولة +كرز +جنية سمراء صغيرة +تحولات +خبز الزنجبيل +سطح أملس +فستق +تورتى +كومبوت +نعناع +نبات +شوكولاتة +قصب +كعكة +كريم +كريب +مرنغ +نفيخة +الكعك +البون بون +كاسترد +أناناس +الكرمل +يكر +عسل +الزبد +شراب مركز +السكر +شربات +خوخ +جوزة الطيب +الموسية +سكريات الطوفي حلوى +راوند +بندق +تخثر +فطيرة الجبن +سبوموني +الحاضنة +زنجبيل +فطيرة +كوكي +البسكويت +بسكويت +جرانيتا +صقيع +البرتقالي +جوزة الهند +بودنغ +حلوى +الكمأة +توت العُليق +معكرون نوع حلوي +كانولي +فطيرة الخوخ +سحق +هش +قرفة +ليمون +هلام +جوز +الفانيليا +بارفيتس +مثلجات +إبله +بلاك بيري +[ستريوسل] +حلوى من سكر أسمر وزبدة +الكعك المحلى بالسكر +مربى +بيض +تثليج diff --git a/extras/cloak/ciphers/dessertsChinese b/extras/cloak/ciphers/dessertsChinese new file mode 100644 index 0000000..b3fc514 --- /dev/null +++ b/extras/cloak/ciphers/dessertsChinese @@ -0,0 +1,94 @@ +蛋糕 +甜甜圈 +草莓 +橙 +焦糖 +糖浆 +越橘 +姜 +酥皮 +蛋白杏仁饼干 +榛子 +乳蛋糕 +果仁蛋糕 +皮匠 +香草 +培育 +周转 +糖粉奶油细末 +杯形饼 +棒糖 +软糖 +酸橙 +脆 +酥 +棒冰 +核桃 +覆盆子 +包子 +杏 +果盘 +樱桃 +乳酪蛋糕 +紧缩 +糖 +糖果 +柠檬 +松露 +失误 +奶油曲奇 +巧克力 +龟 +奶糖 +桃子馅饼 +甘草 +桃 +凝乳 +杂音 +太妃糖 +热情 +圣代 +冻糕 +布朗尼 +格兰尼塔 +果酱 +果冻 +布丁 +鸡蛋 +黑莓 +开心果 +奶昔 +肉桂 +甘蔗 +薄荷 +酪 +糕点 +杏仁 +釉 +肉豆蔻 +冰糕 +松饼 +果子露 +花 +绉 +菠萝 +大黄 +蓝莓 +沙锅 +结霜 +邦邦 +蜜饯 +吸盘 +姜饼 +香炸奶酪卷 +奶油 +伽纳彻 +曲奇饼 +椰子 +果馅饼 +馅饼 +摩丝 +积冰 +泡芙 +蜂蜜 +饼干 diff --git a/extras/cloak/ciphers/dessertsHindi b/extras/cloak/ciphers/dessertsHindi new file mode 100644 index 0000000..b854731 --- /dev/null +++ b/extras/cloak/ciphers/dessertsHindi @@ -0,0 +1,84 @@ +केक +बादाम का मीठा हलुआ +टुकड़े +कुचले हुए फल +जायफल +कलाकंद +कुकी +कप केक +दालचीनी +क्रेप +कारोबार +चीज़केक +खुबानी +बटरस्कॉच +सिरप +टाफ़ी +जाम +जिंजरब्रेड +नारंगी +कुकीज़ +ठंडा करना +ब्राउनी +पाई +शहद +क्रीम +एक प्रकार का फल +बिस्कुट +आड़ू +चीनी +अदरक +मिठाई +टोफ़ी +नद्यपान +नाज़ुक +चेरी +चूसने की मिठाई +वनीला +दही +दिलचस्पी +गन्ना +पिस्ता +चॉकलेट +मोची +गनाचे +अंडे +शीशे का आवरण +कचौड़ी +पेस्ट्री +छाछ +जेली +नारियल +बन +चूना +कश +की कमी +फ़्लान +कारमेल +नींबू +शर्बत +आड़ु पाई +मिल्कशेक +फूल +डोनट +स्ट्रॉबेरीज +पालक +अखरोट +ब्लूबेरी +पुदीना +मलाई +मानसिक शांति +हेज़लनट +ब्लैकबेरी +बादाम +रसभरी +कैंडी +मूस +टर्नओवर +बॉन बॉन +कछुआ +चूसने वाला +कस्टर्ड +कुकुरमुत्ता +पुडिंग +अनानास diff --git a/extras/cloak/ciphers/dessertsPersian b/extras/cloak/ciphers/dessertsPersian new file mode 100644 index 0000000..45b3b3a --- /dev/null +++ b/extras/cloak/ciphers/dessertsPersian @@ -0,0 +1,92 @@ +آناناس +تخم مرغ +بستنی چوبی +حجم معاملات +بستنی و مغز گردو +نان شیرینی مرکب از شکر و زرده تخم مرغ و بادام +فندق +زنجبیل +ژله +گردو +دونات +پینه دوز +لاک پشت +مستی +زغال اخته +پسته +سرخ +طفل شیرخوار +گل +میلک شیک +شیرینی زنجفیلی +شکننده +جوز +نارگیل +پودینگ +نارنجی +ابدوغ +کلوچه +کمپوت +بحران +شکلات +هلو +شربت +کرپ +کیک تخم مرغ و شکر و مغز گردو +تمشک +لیمو شیرین +عسل +گردش +زردالو +کیک میوه +پای +کیک +بستنی میوه +تافی +کرم رنگ +کوکی +اب نبات چوبی +نوعی کیک میوه دار +توت سیاه +ریواس +فاستر +وانیل +نبات +بیسکویت +قارچ خوراکی دنبلان +لیکور +شیرینی +شکر و تخم مرغ +بستنی میوه و مغز بادام و میوه جات ایتالیایی +یکجور دوربین عکاسی +شیرین بیان +کماج +فوندانت +نیشکر +کرم +پاف +قند +نعناع +موس +گرانیت +دارچین +اهک +پوشش +گراوند +بادام +فیالبداهه +پای هلو +شیرینی خامهدار و بستنی دار +کیک پنیر +نوعی کیک کوچک +توت فرنگی +رنگ زرد +مربا +سوفله +کاستارد +درخت زغال اخته +کشک +گیلاس +مزه +نان روغنی +لعاب diff --git a/extras/cloak/ciphers/dessertsRussian b/extras/cloak/ciphers/dessertsRussian new file mode 100644 index 0000000..c90bc2e --- /dev/null +++ b/extras/cloak/ciphers/dessertsRussian @@ -0,0 +1,90 @@ +присоска +праздничный торт +малина +трюфель +лесной орех +леденец +кремовый +песочное печенье +ананас +мускатный орех +лайм +печенье +сироп +абрикос +лимон +кондитерские изделия +миндальное печенье +эклер +конфета +имбирный пряник +чизкейк +ваниль +крем +сапожник +флан +цветок +мусс +творог +шоколад +брюле +хруст +кексы +черепаха +карамель +имбирь +обороты +иней +желе +пирог +яйца +домовой +фисташковый +парфе +варенье +сахар +кекс +грецкий орех +глазурь +мята +обледенение +затяжек +булочка +эскимо +конфеты +тростник +ликер +вишня +кокос +суфле +персиковый пирог +корица +помадка +молочный коктейль +пудинг +черника +ежевика +ревень +меренга +ириски +персик +ломкий +пломбир +ириска +пончик +миндальный +блюдо из дичи +марципан +лакрица +способствовать +заварной крем +мед +компот +пахта +цедра +оборот +канноли +оранжевый +шербет +клубника +креп diff --git a/extras/cloak/ciphers/dessertsSwedishChef b/extras/cloak/ciphers/dessertsSwedishChef new file mode 100644 index 0000000..ee756c4 --- /dev/null +++ b/extras/cloak/ciphers/dessertsSwedishChef @@ -0,0 +1,104 @@ +boon +meelksheke-a +brooneee-a +mooffffeens +coosterd +bleckberry +ceennemun +tureemisoo +teffffy +cubbler +guneche-a +fundunt +pooddeeng +perffeeets +shurtbreed +meceruun +syroop +flooer +meent +suooffffle-a +cuukeee-a +merzeepun +bootterscutch +creme-a +soondee-a +streoosel +creem +ceremel +cherry +sooger +shurtceke-a +hoockleberry +hezelnoot +geenger +oorunge-a +tuffffee-a +muoosse-a +cunnulee +sherbet +jelly +cheeseceke-a +chuculete-a +cune-a +coopceke-a +cuukeees +surbet +crepe-a +iceeng +duooghnoot +pestry +toortle-a +mereengooe-a +gruneeta +leeme-a +epreecut +sneeckerduudles +toornufers +beescooits +gleze-a +rhooberb +huney +coord +lulleepup +bunbun +dunoot +ceke-a +breettle-a +croonch +leeqooer +frusteeng +pupseecle-a +spoomunee +cundy +pooffffs +soocker +blooeberry +toornufer +nootmeg +broolee-a +lemun +cunffecshun +terreene-a +respberry +elmund +turte-a +velnoot +mereeunberry +fuster +peee-a +peech +trooffffle-a +cumpute-a +leecurice-a +cucunoot +peeneepple-a +jem +geengerbreed +iggs +flun +zest +peestechiu +strevberreees +écleur +funeella diff --git a/extras/cloak/ciphers/dessertsThai b/extras/cloak/ciphers/dessertsThai new file mode 100644 index 0000000..dcf6281 --- /dev/null +++ b/extras/cloak/ciphers/dessertsThai @@ -0,0 +1,86 @@ +นมผสมไอศกรีม +ไข่ +แห้ว +เปลือกน้ำฅาล +ครีม +ผลไม้ชนิดหนึ่ง +ผลไม้แช่อิ่ม +ขนมเมอร์แรง +ฉาบ +ความเอร็ดอร่อย +คุกกี้ +โดนัท +ลูกจันทน์เทศ +นมเปรี้ยว +พาย +ขนมชนิดร่วน +ไอติม +ราสเบอร์รี่ +ทอฟฟี่ +เฮเซลนัท +ขนมปิ้ง +อ้อย +ทำเหรียญ +น้ำผึ้ง +มะพร้าว +กาละแม +อุปถัมภ์ +บัตเตอร์ +อาหารตีให้เป็นฟอง +ขนมปังขิง +เชอร์รี่ +พุดดิ้ง +ผักชนิดหนึ่ง +มวย +ผลประกอบการ +สีส้ม +ต้นมันฮ่อ +ลูกอม +อัลมอนด์ +ขนมแมคะรูน +สตรอเบอร์รี่ +เครื่องปรุงอาหารมาร์ซิปัน +มะนาว +ขนมปังกรอบ +ลูกกวาด +คัพเค้ก +ฅกประหม่า +ผี +อบเชย +ขนมชนิดหนึ่ง +น้ำเชื่อม +เต่า +แอปริคอท +ขนมเค้กเนยแข็ง +พาย ลูกพีช +เครื่องดื่มเชอร์เบ็ท +วุ้น +เค้ก +กระทืบ +ช็อคโกแลต +มูสส์ +แพรย่น +ผลไม้ดำนำ้เงินลูเล็ก ๆ +ขิง +คัสตาร์ +ไอศกรีมใส่ผลไม้ +แยม +เครื่องดูด +มัฟฟิน +ขนมที่ติดกับปลายไม้ +ดอกไม้ +น้ำตาล +หลากสี +บลูเบอร์รี่ +พีช +วานิลลา +เชอร์เบท +คุ้กกี้ +พิสตาเชีย +เคลือบน้ำแข็ง +เปราะ +พัฟ +พายผลไม้ +พืชชะเอ็ม +สับปะรด +บัตเตอร์ครีม diff --git a/extras/cloak/ciphers/emoji b/extras/cloak/ciphers/emoji new file mode 100644 index 0000000..8a6bec4 --- /dev/null +++ b/extras/cloak/ciphers/emoji @@ -0,0 +1,70 @@ +😀 +😴 +😜 +😝 +😩 +😃 +😛 +😕 +😏 +👊 +🙉 +😿 +😅 +😁 +😭 +🐱 +😸 +🙌 +😓 +🙈 +🐨 +😽 +🐵 +😮 +😈 +😆 +😑 +😶 +🐔 +😂 +😪 +😥 +🙆 +😲 +🙇 +😾 +😹 +🙍 +😗 +😳 +😼 +😧 +🐸 +🙀 +🖖 +😌 +😟 +🙅 +😬 +🙊 +🐼 +😄 +😣 +🐻 +😻 +😱 +😯 +😷 +😊 +🐂 +🐰 +😵 +😰 +🙏 +🙎 +😺 +🙋 +😫 +😡 +😙 diff --git a/extras/cloak/ciphers/evadeAV b/extras/cloak/ciphers/evadeAV new file mode 100644 index 0000000..2a9c4f5 --- /dev/null +++ b/extras/cloak/ciphers/evadeAV @@ -0,0 +1,65 @@ +4 +v +q +m +0 +B +j +u +E +e +g +J +w +y +Y +Q +D +H +t +x +i +3 +6 +f +O +C +9 +N +a +T +Z +F +A +5 +G +M +h +s +o +7 +l +U +k +R +L +X +n +r +W +d +P +K +S +I +c += ++ +/ +8 +V +2 +1 +p +b +z diff --git a/extras/cloak/ciphers/geoCoordsWorldCapitals b/extras/cloak/ciphers/geoCoordsWorldCapitals new file mode 100644 index 0000000..d82320d --- /dev/null +++ b/extras/cloak/ciphers/geoCoordsWorldCapitals @@ -0,0 +1,199 @@ +18°21'N 64°56'W +05°50'N 55°10'W +00°15'S 78°35'W +12°06'N 86°20'W +13°50'S 171°50'W +14°36'N 61°02'W +59°55'N 10°45'E +43°52'N 18°26'E +50°30'N 30°28'E +37°31'N 126°58'E +29°18'S 27°30'E +06°55'N 158°09'E +51°40'S 59°51'W +37°58'N 23°46'E +01°59'S 30°04'E +25°10'S 57°30'W +04°00'N 73°28'E +35°10'N 33°25'E +05°35'N 00°06'W +22°35'S 17°04'E +03°16'S 29°18'E +14°40'N 121°03'E +02°02'N 45°25'E +52°23'N 04°54'E +09°24'S 147°08'E +18°40'N 72°20'W +46°04'N 14°33'E +12°00'S 77°00'W +35°54'N 14°31'E +27°31'N 89°45'E +23°08'N 82°22'W +15°31'N 32°35'E +17°20'N 61°48'W +21°05'N 105°55'E +09°00'N 79°25'W +33°40'N 73°10'E +49°26'N 02°33'W +14°00'S 33°48'E +59°22'N 24°48'E +53°00'S 74°00'E +24°45'S 25°57'E +18°28'N 66°07'W +15°28'S 28°16'E +53°52'N 27°30'E +42°01'N 21°26'E +25°58'S 32°32'E +09°05'N 07°32'E +11°40'S 43°16'E +00°25'N 09°26'E +22°17'S 166°30'E +25°05'N 77°20'W +19°20'N 99°10'W +36°30'S 60°00'W +45°50'N 15°58'E +09°02'N 38°42'E +31°57'N 35°52'E +17°32'S 149°34'W +12°10'N 14°59'E +14°16'S 170°43'W +35°15'S 149°08'E +01°17'S 36°48'E +06°23'N 02°42'E +12°15'N 01°30'W +41°19'S 174°46'E +04°23'N 18°35'E +46°46'N 56°12'W +24°28'N 54°22'E +18°00'N 76°50'W +40°25'N 03°45'W +14°05'N 87°14'W +15°02'N 23°34'W +13°28'N 16°40'W +23°43'N 90°26'E +42°45'N 23°20'E +09°55'N 84°02'W +12°05'N 69°00'W +49°37'N 06°09'E +48°12'N 16°22'E +41°43'N 44°50'E +40°10'N 44°31'E +04°34'N 74°00'W +41°20'N 69°10'E +13°10'N 61°10'W +41°54'N 12°29'E +41°18'N 19°49'E +39°55'N 116°20'E +44°27'N 26°10'E +46°57'N 07°28'E +08°31'S 179°13'E +24°41'N 46°42'E +50°51'N 04°21'E +35°44'N 51°30'E +12°34'N 07°55'W +04°52'N 115°00'E +40°29'N 49°56'E +27°45'N 85°20'E +21°10'S 174°00'W +43°55'N 12°30'E +42°31'N 01°32'E +18°30'N 69°59'W +33°20'N 44°30'E +05°05'N 52°18'W +04°20'S 15°15'E +53°21'N 06°15'W +00°10'N 06°39'E +17°17'N 62°43'W +54°38'N 25°19'E +32°49'N 13°07'E +47°02'N 28°50'E +30°01'N 31°14'E +14°34'N 17°29'W +34°28'N 69°11'E +15°47'S 47°55'W +13°45'N 100°35'E +08°50'S 13°15'E +20°10'S 57°30'E +00°20'N 32°30'E +16°45'N 96°20'E +64°10'N 51°35'W +12°48'S 45°14'E +11°08'N 42°20'E +64°10'N 21°57'W +55°45'N 37°35'E +28°37'N 77°13'E +03°09'N 101°41'E +60°15'N 25°03'E +03°45'N 08°50'E +15°12'N 145°45'E +15°19'N 38°55'E +09°29'N 13°49'W +56°53'N 24°08'E +29°30'N 48°00'E +17°43'S 1°02'E +16°20'S 68°10'W +08°30'N 13°17'W +31°47'N 35°12'E +45°20'S 168°43'E +48°10'N 17°07'E +06°49'N 05°17'W +22°12'N 113°33'E +06°18'N 10°47'W +25°44'S 28°12'E +38°33'N 68°48'E +48°50'N 02°20'E +10°30'N 66°55'W +18°27'N 64°37'W +36°50'N 10°11'E +17°45'S 168°18'E +11°33'N 104°55'E +08°29'S 125°34'E +52°13'N 21°00'E +51°36'N 00°05'W +33°30'N 36°18'E +62°05'N 06°56'W +26°10'N 50°30'E +15°20'N 61°24'W +42°54'N 74°46'E +39°91'N 77°02'W +06°50'N 58°12'W +01°30'N 173°00'E +39°57'N 32°54'E +44°50'N 20°37'E +16°00'N 61°44'W +47°29'N 19°05'E +17°58'N 102°36'E +18°55'S 47°31'E +06°09'N 01°20'E +11°45'N 15°45'W +33°53'N 35°31'E +13°40'N 89°10'W +34°50'S 56°11'W +17°18'N 88°30'W +06°09'S 106°49'E +47°08'N 09°31'E +51°10'N 71°30'E +45°27'N 75°42'W +52°30'N 13°25'E +13°27'N 02°06'E +38°00'N 57°50'E +50°05'N 14°22'E +14°02'N 60°58'W +14°40'N 90°22'W +03°50'N 11°35'E +13°05'N 59°30'W +33°24'S 70°40'W +07°20'N 134°28'E +36°42'N 03°08'E +38°42'N 09°10'W +12°32'N 70°02'W +18°06'S 178°30'E +06°08'S 35°45'E +59°20'N 18°03'E +09°27'S 159°57'E +04°09'S 15°12'E +23°37'N 58°36'E +25°15'N 51°35'E +39°09'N 125°30'E +19°20'N 81°24'W +26°18'S 31°06'E diff --git a/extras/cloak/ciphers/geocache b/extras/cloak/ciphers/geocache new file mode 100644 index 0000000..b63de38 --- /dev/null +++ b/extras/cloak/ciphers/geocache @@ -0,0 +1,82 @@ +Carley State Park N 44 º 06.717 W 092 º 10.390 +Scenic State Park N 47 º 42.700 W 093 º 34.167 +Lake Bronson State Park N 48 º 43.472 W 096 º 37.545 +Myre-Big Island State Park N 43 º 38.226 W 093 º 18.541 +Interstate State Park N 45 º 23.518 W 092 º 40.199 +Tettegouche State Park N 47 º 21.592 W 091 º 16.939 +Garden Island State Recreation Area N 49 º 10.537 W 094 º 50.031 +Nerstrand Big Woods State Park N 44 º 20.533 W 093 º 06.339 +Bear Head Lake State Park N 47o 47.787 W 092o 03.858 +Cascade River State Park. N 47 º 42.660 W 090 º 30.643 +Mille Lacs Kathio State Park N 46 º 08.132 W 093 º 43.520 +Schoolcraft State Park N 47 º 13.390 W 093 º 48.252 +Frontenac State Park N 44 º 31.428 W 092 º 20.467 +Temperance River State Park N 47 º 33.241 W 090 º 52.498 +Cuyuna Country State Recreation Area N 46 º 28.724 W 093 º 58.598 +Brown’s Creek State Trail N 45 º 04.531 W 092 º 49.776 +Minnesota Valley State Trail N 44 º 46.901 W 093 º 35.350 +Lake Louise State Park N 43 º 31.739 W 092 º 31.452 +Itasca State Park N 47 º 11.488 W 095 º 10.199 +Split Rock Creek State Park N 43 º 53.664 W 096 º 21.941 +Kilen Woods State Park N 43 º 43.858 W 095 º 04.101 +Zippel Bay State Park N 48 º 50.891 W 094 º 50.859 +Split Rock Lighthouse State Park N 47 º 11.912 W 091 º 22.479 +George H. Crosby Manitou State Park N 47 º 28.732 W 091 º 06.703 +Glendalough State Park N 46 º 19.233 W 095 º 40.287 +Gateway State Trail N 45 º 03.522 W 092 º 55.627 +Sakatah Lake State Park N 44 º 13.504 W 093 º 31.181 +Hill Annex Mine State Park N 47 º 19.585 W 093 º 16.697 +Root River State Trail N 43 º 46.298 W 091 º 38.153 +Lake Bemidji State Park N 47 º 32.079 W 094 º 49.590 +La Salle Lake State Recreation Area N 47 º 20.697 W 095 º 09.507 +Franz Jevne State Park N 48 º 38.526 W 094 º 03.773 +Minnesota Valley State Recreation Area N 44 º 39.144 W 093 º 42.849 +Sibley State Park N 45 º 18.865 W 095 º 02.355 +Blazing Star State Trail N 43 º 38.226 W 093 º 18.541 +Judge C.R. Magney State Park N 47 º 49.082 W 090 º 03.173 +Iron Range Off-Highway Vehicle State Recreation Area N 47 º 28.721 W 092 º 26.319 +Upper Sioux Agency State Park N 44o 44.203 W 095 º 27.571 +Blue Mounds State Park N 43 º 41.474 W 096 º 11.807 +Luce Line State Trail N 44 º 59.163 W 093 º 29.651 +Fort Snelling State Park N 44o 53.349 W 093o 11.014 +Fort Ridgely State Park N 44 º 27.193 W 094 º 43.607 +Hayes Lake State Park N 48 º 38.257 W 095 º 32.739 +Charles A. Lindbergh State Park N 45 º 57.548 W 094 º 23.337 +Lake Maria State Park N 45 º 19.070 W 093 º 56.139 +Gooseberry Falls State Park N 47 º 08.463 W 091 º 28.207 +Savanna Portage State Park N 46 º 49.716 W 093 º 09.031 +Grand Portage State Park N 48 º 00.200 W 089 º 35.657 +Greenleaf Lake State Recreation Area N 45 º 00.536 W 094 º 28.491 +Forestville/Mystery Cave State Park N 43 º 38.425 W 092 º 13.110 +Big Stone Lake State Park N 45 º 23.126 W 096 º 32.099 +Lake Vermilion-Soudan Underground Mine State Park N 47 º 49.197 W 092 º 14.320 +Red River State Recreation Area N 47 º 55.743 W 097 º 01.723 +Great River Bluffs State Park N 46 º 51.919 W 096 º 28.031 +Crow Wing State Park N 46 º 16.389 W 094 º 19.972 +Beaver Creek Valley State Park N 43 º 38.571 W 091 º 34.872 +Shooting Star State Trail N 43 º 31.547 W 092 º 30.986 +Glacial Lakes State Park N 45 º 32.438 W 095 º 31.430 +Flandrau State Park N 44 º 17.596 W 094 º 28.065 +Lac Qui Parle State Park N 45 º 02.620 W 095 º 53.025 +Wild River State Park N 45 º 32.139 W 092 º 43.947 +Lake Shetek State Park N 44 º 06.248 W 095 º 41.103 +Maplewood State Park N 46 º 32.361 W 095 º 59.151 +Old Mill State Park N 48 º 21.691 W 096 º 34.011 +Banning State Park N 46 º 09.869 W 092 º 50.373 +Jay Cooke State Park N 46 º 39.271 W 092 º 22.270 +Camden State Park N 44 º 20.787 W 095 º 55.735 +Afton State Park N 44 º 51.336 W 092 º 46.484 +Minneopa State Park N 44 º 08.879 W 094 º 05.540 +Rice Lake State Park N 44 º 05.576 W 093 º 03.849 +McCarthy Beach State Park N 47 º 40.200 W 093 º 01.830 +Whitewater State Park N 44 º 03.206 W 092 º 02.703 +Monson Lake State Park N 45 º 19.164 W 095 º 16.493 +Father Hennepin State Park N 46 º 08.614 W 093 º 28.948 +Lake Carlos State Park N 46 º 00.052 W 095 º 20.073 +Moose Lake State Park N 46 º 26.109 W 092 º 43.949 +John A. Latsch State Park N 44 º 10.310 W 091 º 50.319 +St. Croix State Park N 45 º 57.048 W 092 º 34.198 +Big Bog State Recreation Area N 48 º 10.203 W 094 º 30.901 +Garden Island State Recreation Area Alternate N 48 º 52.073 W 094 º 50.896 +William O’Brien State Park N 45 º 13.373 W 092 º 46.047 +Buffalo River State Park N 46 º 51.919 W 096 º 28.031 diff --git a/extras/cloak/ciphers/hashesMD5 b/extras/cloak/ciphers/hashesMD5 new file mode 100644 index 0000000..bc91408 --- /dev/null +++ b/extras/cloak/ciphers/hashesMD5 @@ -0,0 +1,113 @@ +033698705E420DD71634D5C8A861DE7E +0566F25FC73E4ACC826C84FF521EDAF7 +05D5668D5CF9A65FAABE2186C0B19001 +0991756FBCC2D438CDDD07E7BA996C4F +0A12376A0B0A65C39299D94EB02FE799 +0A26C74B6012B5BBBF715B9327C00C44 +0BF2D9B8F392C853EE41F15006A38839 +0F5F49305B40F326674AD23AED0554BC +0F82D00A63498CCE8982D5608B759F9E +10515EC6CF372232E995602BB7A70046 +1080418C171BB86F202DA3EB234C74A1 +108B7B6D86873256A1958916035872E9 +10B43971A8295F3720F38FBCDD9D6AC6 +137609CBF5410CFDC487FC2118FB16AE +13D1261EFBCEAE62EC6B65F3257769A4 +15BB21591BE151CAADCC264D3602E522 +1ACC555ADC3E731133EEAA80154BB886 +1B4E227142C24B81C9EAA61122B12CB1 +1C63129AE9DB9C60C3E8AA94D3E00495 +1D1E60D5E0B698FF150DCAB24DF184D5 +1F7A1132D93837D2A83E4CA8FABA9941 +2345F10BB948C5665EF91F6773B3E455 +236B922AEA10AF085C5206E4D5DBCC85 +26B580B0AEDE3B3E8B58BC761E09577C +26E059C26592E4A078CCB31AFEDF213C +26FEE1830A3552695A975E509B289F0D +2902A7FD778812E75F953779B67BE83C +2AAE667514F164221A71E9CEB734E31A +2B92AD5136C0C171DF9B02A24D3D9C82 +332D114301906A70E56EDB1325B192E3 +3362E5D0E467010F8FFAFE6E079B3FCC +35E656E1FCF2FC8FBCAC23EA148E7BD0 +3B287E2F82D9B57BD0801638A21B6EB6 +40068DCA5800AD8BC5E1EA749B5A968F +447CC066DE9703C5AEE3FDD3AF0AD5E0 +45C311F94E075EF1F15EFBA7B5084A10 +498A8A3364A43A8E9D880E441043E33F +4AAEA6397CFA277E4433FA325FA396F7 +4DC642D0E0881B63072691C194F99B7E +51951570A66679F7B5C21A83E3385D13 +5263DC84FFBA8FA607754CACCE3E65FD +57AC36ADC5258C1B8048A7D7BD966A73 +5836CAD35828419B754B684A9DA147A0 +596BFF793A503D75B68B760A9BF70AA3 +5E5B18D4681B24F342F89A19DA2D4699 +604E708741886E3D922D26CE1A7B2835 +618206DD0078A5740373C161D7570989 +64B9469496B3012D4E19F626AC068233 +64F4AE7B5A81F0EB65316410581047C0 +6676E7D0995EBD8DBD136869A9358D14 +69BDBA2238286ED674D2DBD66319B629 +69F3EEC589EFF77854287AF84E0258FE +6FC4B922446021AD57578E4E281D7965 +722EF044BF1D7A293440B68A6E7B6721 +744CE343D3FAF9FBFA81116688714F3B +791701316B125F94CC61F8C2D9FF9C58 +7989D7CFAF00CAB7D0B6A58324EB63E9 +7A2D09AF8F40467DDDAF0F946960ADE3 +7AD7E9A563E9F3CA7175DE3668C85654 +7BCD03390834DFF914740E27D826C2DA +7E5FAF44E6D49A0000135A9D5D59EF76 +7EDEB90A6ED6E0141E9F28FACA7F3AF6 +8350ADB55BAA13F09BFB53B0D51CAF2D +859C7547DF3CA77B07D4ECD3B0F42F57 +865BDF0F2727792BCD77C7BE5B36C6CA +8745BA34F93696B1165C36A52FAC0FDF +8904646023577F9746BADE425D317ABE +8911BFAF73444B67B000B3D3EDB55E6D +8A548185B6A6A873D9243072B13D04AB +8B0EE5A501CEF4A5699FD3B2D4549E8F +8BD2DB1BE8AABBC2CE9AE757D0302707 +939E652393234AE78B511092C5B3A0B6 +93FE91EB27123C4927105753C4DB4B7D +9536637DF923B3AAD6DDE0A80D7CD7E4 +9684C7747527BFA45DE2D0E733058D9F +970796E057AD9284F16AF55E19BDCE7F +9A0711EC9F302EDE9C07731208553E69 +9FEA03AA1B4293B8566B1B5AEAE12D8F +A304C99480E027B2D2AE5A9D10021335 +A33B929706F3280EC6D46BE67E569915 +A402080405F59AAD7E3C66B2339B1311 +A4DC1273708D83FCF39355AFA587E2EC +A5484EEFDBC11797A293DA331B31C62B +A59D3A8442AD87289D6891238CD9C7DD +A8A4C199766A66EA54079F19F819EE8D +A8EA4070D693DB509DECA6676DE675E9 +AA13ABDB56EA5FD37B133F96EB3E3B6A +AB6A89F36224022B8A954316C55137DC +AEBA8FB7353C9C4F9B27F015FB9DC5AD +B13A1C9325803C9258F868EF97F04F8D +B32FD22E4BFAD91974A40D08EBC7D8B1 +B55549D6177C833E55DFA04F6A3650DC +B79313B4FE11BF40EA80915AD676BE5E +B80370360E1E0D5F7BA9709B12A01DEA +BAE0168A5446D0B00D13B5CEC4D6F905 +BBA3BAFE548581C53B933B7DCCE620AB +C03AA55846E82AEEADF1879065BAF7ED +C44A471BD78CC6C2FEA32B9FE028D30A +C5B68394786DF93CF7AD7366D3D5807C +CD00B006870EABFBB56135FFAF2AC444 +CD8032768CFBD94F5C5876BA56EB78CD +D27E2ABDB7A8F23407B803E04EB5AD90 +DB99B1E9EE0E4BB159F9256820214634 +E0F79190404F264B77DEA125D5FC8304 +E12B91EF812074FFD54663280739B825 +F0B2231D462E970D954AA661122D1034 +F55893FDF4409E1C6C2574C8D3005A6E +F5E852552DEB0FF9A3899938E77CCCDE +F89684B8DD9E68E3261E617D772ECF0E +FA767CDB99CE06491731B69DDEEFBD69 +FCC96DF2D80B43831F5926BE58F63574 +FDB8250C494E39F3820B7C81DA1418A7 +FE4CEEB01D43A6C29D8F4FE93313C6C1 diff --git a/extras/cloak/ciphers/ipAddressesTop100 b/extras/cloak/ciphers/ipAddressesTop100 new file mode 100644 index 0000000..3670435 --- /dev/null +++ b/extras/cloak/ciphers/ipAddressesTop100 @@ -0,0 +1,77 @@ +198.78.201.252 +209.200.154.225 +69.171.224.11 +144.198.29.112 +69.65.13.216 +208.87.33.151 +209.31.22.39 +69.63.181.15 +69.63.187.17 +65.55.72.135 +208.94.146.80 +74.125.157.99 +69.63.181.12 +178.162.238.136 +64.208.126.67 +72.247.244.88 +69.10.25.46 +178.17.165.74 +69.63.176.13 +97.107.137.164 +131.253.13.32 +98.124.248.77 +199.59.148.10 +195.191.207.40 +194.71.107.15 +31.7.57.13 +69.63.187.18 +212.58.241.131 +208.80.152.201 +80.94.76.5 +93.158.65.211 +89.238.130.247 +173.231.140.219 +199.7.177.218 +216.239.113.172 +95.211.149.7 +174.121.194.34 +173.0.84.3 +74.125.224.72 +207.97.227.239 +95.211.143.200 +91.220.176.248 +199.59.149.230 +174.140.154.20 +74.125.65.91 +65.39.178.43 +62.149.24.66 +74.125.224.181 +69.63.181.11 +199.47.217.179 +72.233.56.138 +97.107.132.144 +84.22.170.149 +62.149.24.67 +69.174.244.50 +109.163.226.240 +23.21.142.179 +216.52.208.187 +69.63.187.19 +98.139.183.24 +76.74.254.126 +205.196.120.13 +98.137.149.56 +65.55.175.254 +199.9.249.21 +69.63.184.142 +216.52.242.86 +184.173.141.231 +208.223.219.206 +194.71.107.50 +67.201.54.151 +64.191.203.30 +174.140.154.32 +72.21.211.176 +67.21.232.223 +23.23.130.59 +69.171.234.21 diff --git a/extras/cloak/ciphers/pokemonGo b/extras/cloak/ciphers/pokemonGo new file mode 100644 index 0000000..1073468 --- /dev/null +++ b/extras/cloak/ciphers/pokemonGo @@ -0,0 +1,76 @@ +Bellsprout +Zubat +Doduo +Rhyhorn +Dratini +Snorlax +Krabby +Onix +Ponyta +Paras +Lapras +Drowzee +Zapdos +Diglett +Sandshrew +Ekans +Lickitung +Tangela +Scyther +Oddish +Geodude +Slowpoke +Voltorb +Magmar +Pidgey +Caterpie +Nidoran +Poliwag +Shellder +Koffing +Seel +Mew +Growlithe +Machop +Vulpix +Porygon +Mankey +Hitmonchan +Farfetchd +Kabuto +Tauros +Venonat +Articuno +Clefairy +Psyduck +Jynx +Squirtle +Horsea +Jigglypuff +Mewtwo +Pinsir +Hitmonlee +Goldeen +Kangaskhan +Moltres +Cubone +Magnemite +Staryu +Weedle +Charmander +Pikachu +Omanyte +Tentacool +Spearow +Grimer +Gastly +Abra +Magikarp +Rattata +Aerodactyl +Bulbasaur +Electabuzz +Meowth +Ditto +Chansey +Exeggcute diff --git a/extras/cloak/ciphers/rickrollYoutube b/extras/cloak/ciphers/rickrollYoutube new file mode 100644 index 0000000..8971af6 --- /dev/null +++ b/extras/cloak/ciphers/rickrollYoutube @@ -0,0 +1,67 @@ +https://bit.ly/1bu2Ruu +https://bit.ly/1ijxdRx +https://bit.ly/1FQbMVt +https://bit.ly/2nQmPXd +https://bit.ly/2oq4DYI +https://bit.ly/2Kb9fsx +https://bit.ly/1f9lqAP +https://bit.ly/IqT6zt +https://bit.ly/2HjNryg +https://bit.ly/2efiE68 +https://bit.ly/2geoqTg +https://bit.ly/2xZrYlX +https://bit.ly/29wawO1 +https://bit.ly/2IvdUsg +https://bit.ly/2Guggqi +https://bit.ly/1p9Gf4X +https://bit.ly/2jQX9JX +https://bit.ly/2KT5CbZ +https://bit.ly/2gkkzU2 +https://bit.ly/2ItVvMx +https://bit.ly/2I9RflR +https://bit.ly/2FFZyE3 +https://bit.ly/2uGlEgu +https://bit.ly/2jP0U2S +https://bit.ly/2IvQJOs +https://bit.ly/2lqrm1G +https://bit.ly/R0z0jZ +https://bit.ly/1yA76u9 +https://bit.ly/1zTtQZr +https://bit.ly/2Iwbcmh +https://bit.ly/2I92hnl +https://bit.ly/2IcYpC2 +https://bit.ly/2I5fm56 +https://bit.ly/2KcvsXq +https://bit.ly/2KRVKPD +https://bit.ly/2jN3VjX +https://bit.ly/2KS8mqi +https://bit.ly/1QasgsE +https://bit.ly/2ryu1eN +https://bit.ly/2ff2sPq +https://bit.ly/2I5eIVr +https://bit.ly/2G472wA +https://bit.ly/2rxYokQ +https://bit.ly/2eO3vYp +https://bit.ly/2jLbl7w +https://bit.ly/2rxVPQq +https://bit.ly/1UisbYb +https://bit.ly/2ry3luH +https://bit.ly/2G3vWNb +https://bit.ly/1iegU5b +https://bit.ly/2G3wnHj +https://bit.ly/2I6dYPX +https://bit.ly/2rxWXn8 +https://bit.ly/2wxIYCQ +https://bit.ly/2jO8lY8 +https://bit.ly/2jQbuXg +https://bit.ly/29yCC7s +https://bit.ly/2KOGFyi +https://bit.ly/2KTRv6q +https://bit.ly/2IvLePW +https://bit.ly/2jP6ylA +https://bit.ly/2KcD3VQ +https://bit.ly/1NistpZ +https://bit.ly/1Qz4NnI +https://bit.ly/2Ib66bT +https://bit.ly/2Bj7825 +https://bit.ly/2rzRuLR diff --git a/extras/cloak/ciphers/skiResorts b/extras/cloak/ciphers/skiResorts new file mode 100644 index 0000000..56c8e49 --- /dev/null +++ b/extras/cloak/ciphers/skiResorts @@ -0,0 +1,68 @@ +Niseko, Japan +Jackson Hole, Wyoming +Squaw Valley, California +Kirkwood, California +Alpine Meadows, California +Grand Targhee Resort, Wyoming +Red Mountain Resort, British Columbia +Big Bear, California +Alagna, Italy +Grand Targhee, Wyoming +La Hoya, Chile +Mountain High, California +Meribel, France +Kitzbühel, Austria +Breckenridge, Colorado +Heavenly, California & Nevada +Taos, New Mexico +Canyons, Utah +Murren, Switzerland +Snowbasin, Utah +Incline Village, Nevada +Winter Park, Colorado +Shiga Kogen, Japan +Park City, Utah +Smuggler’s Notch, Vermont +Mt. Schweitzer, Idaho +Bernese Oberland, Switzerland +Sierra-at-Tahoe, California +Aspen-Snowmass, Colorado +Riksgransen, Sweden +Telluride, Colorado +Solitude, Utah +Mammoth Mountain, California +Wolf Creek Ski Area +Stowe, Vermont +Craigieburn, New Zealand +Big Sky, Montana +Crested Butte, Colorado +Jay Peak, Vermont +Tremblant, Quebec +Verbier, Switzerland +Cortina d’Ampezzo, Italy +Mount Snow, Vermont +Vail, Colorado +Keystone, Colorado +Sun Valley, Idaho +Timberline, Mt Hood Oregon +Silverton, Colorado +Wanaka, New Zealand +Brighton, Utah +St. Anton, Austria +Mt. Rose, Nevada +Okemo Mountain Resort, Vermont +Copper Mountain, Colorado +Northstar, California +Beaver Creek, Colorado +Whistler-Blackcomb, British Columbia +Sundance, Utah +Nozawa Onsen, Japan +Deer Valley, Utah +Whiteface Mountain, New York +Purgatory, Colorado +Mt. Bachelor, Oregon +Killington, Vermont +Snowbird, Utah +Revelstoke, British Columbia +Treble Cone, New Zealand +Alta, Utah diff --git a/extras/cloak/ciphers/starTrek b/extras/cloak/ciphers/starTrek new file mode 100644 index 0000000..ea0bfd4 --- /dev/null +++ b/extras/cloak/ciphers/starTrek @@ -0,0 +1,147 @@ +Ishka +Nog +Charles Tucker +William Riker +Dolim +Lon Suder +Brunt +Hogan +J. M. Colt +Winn Adami +Leonardo da Vinci +Jake Sisko +Azan +Amanda Grayson +Weyoun +Ayala +Nyota Uhura +Tuvok +Saavik +Lwaxana Troi +Gowron +José Tyler +Miles O'Brien +Kashimuro Nozawa +Soval +William Ross +Shakaar Edon +Kathryn Janeway +Jonathan Archer +Keiko O'Brien +Kimara Cretak +Julian Bashir +Dukat +Spock +Alexander Rozhenko +Seska +Evek +Sonya Gomez +Tora Ziyal +Damar +Chakotay +Mezoti +Hugh of Borg +Sela +Thy'lek Shran +Leonard McCoy +Michael Rostov +Jennifer Sisko +Janice Rand +Daniels +Degra +Beverly Crusher +Kasidy Yates +Reginald Barclay +The Doctor +Kes +Jal Culluh +Rom +Mallora +Elim Garak +Silik +Neelix +Michael Jonas +Phlox +The Borg Queen +Benjamin Sisko +Kurn +Hoshi Sato +Mot +K'Ehleyr +Guinan +Erika Hernandez +B'Etor +Leeta +Harry Kim +James T. Kirk +Joseph Sisko +Tal Celes +The Traveler +Samantha Wildman +Rebi +Morn +Lursa +Luther Sloan +Female Changeling +Susan Nicoletti +Naomi Wildman +Mr. Homn +Katherine Pulaski +Phillip Boyce +Ezri Dax +Christopher Pike +Carol Marcus +Mora Pol +Kira Nerys +Vash +T'Pol +Hikaru Sulu +Jean-Luc Picard +Bareil Antos +Wesley Crusher +Number One +Geordi La Forge +Montgomery Scott +Lore +Garrison +Jannar +Ro Laren +Zek +Icheb +Tomalak +Vorik +Elizabeth Cutler +Maxwell Forrest +Maihar'du +Vic Fontaine +Owen Paris +Michael Eddington +Malcolm Reed +Li Nalas +Pavel Chekov +Travis Mayweather +B'Elanna Torres +Worf +Tom Paris +Sarah Sisko +Jadzia Dax +Mila +Data +Q +Seven of Nine +Christine Chapel +Alyssa Ogawa +Joseph Carey +Molly O'Brien +Sarek +Martok +J. Hayes +Kor +Enabran Tain +Robin Lefler +Deanna Troi +Quark +Chell +Tasha Yar +Opaka Sulan +Odo diff --git a/extras/cloak/ciphers/statusCodes b/extras/cloak/ciphers/statusCodes new file mode 100644 index 0000000..4906cd4 --- /dev/null +++ b/extras/cloak/ciphers/statusCodes @@ -0,0 +1,77 @@ +Status code: 60 +Status code: 612 +Status code: 299 +Status code: 725 +Status code: 974 +Status code: 472 +Status code: 182 +Status code: 256 +Status code: 203 +Status code: 619 +Status code: 915 +Status code: 746 +Status code: 77 +Status code: 857 +Status code: 865 +Status code: 488 +Status code: 115 +Status code: 159 +Status code: 782 +Status code: 500 +Status code: 962 +Status code: 333 +Status code: 938 +Status code: 395 +Status code: 320 +Status code: 821 +Status code: 894 +Status code: 898 +Status code: 287 +Status code: 871 +Status code: 870 +Status code: 575 +Status code: 867 +Status code: 216 +Status code: 116 +Status code: 937 +Status code: 662 +Status code: 593 +Status code: 423 +Status code: 748 +Status code: 647 +Status code: 62 +Status code: 817 +Status code: 452 +Status code: 212 +Status code: 946 +Status code: 471 +Status code: 401 +Status code: 527 +Status code: 935 +Status code: 131 +Status code: 119 +Status code: 868 +Status code: 776 +Status code: 762 +Status code: 706 +Status code: 268 +Status code: 331 +Status code: 106 +Status code: 787 +Status code: 89 +Status code: 134 +Status code: 681 +Status code: 793 +Status code: 971 +Status code: 355 +Status code: 28 +Status code: 31 +Status code: 559 +Status code: 715 +Status code: 501 +Status code: 385 +Status code: 197 +Status code: 709 +Status code: 344 +Status code: 205 +Status code: 892 diff --git a/extras/cloak/ciphers/topWebsites b/extras/cloak/ciphers/topWebsites new file mode 100644 index 0000000..77289ec --- /dev/null +++ b/extras/cloak/ciphers/topWebsites @@ -0,0 +1,71 @@ +office.com +imgur.com +microsoft.com +outbrain.com +amazon.com +reddit.com +aol.com +netflix.com +bankofamerica.com +force.com +wordpress.com +bing.com +foxnews.com +wellsfargo.com +google.com +blogspot.com +cnet.com +homedepot.com +instagram.com +live.com +etsy.com +stackoverflow.com +imdb.com +github.com +facebook.com +huffingtonpost.com +craiglist.org +walmart.com +diply.com +quora.com +wikia.com +pinterest.com +groupon.com +bestbuy.com +pandora.com +tripadvisor.com +msn.com +amazonaws.com +indeed.com +tumblr.com +apple.com +xfinity.com +comcast.net +capitalone.com +citi.com +ebay.com +go.com +espn.go.com +yelp.com +zillow.com +vice.com +salesforce.com +washingtonpost.com +chase.com +forbes.com +buzzfeed.com +cnn.com +microsoftonline.com +twitter.com +americanexpress.com +paypal.com +target.com +wikipedia.com +nytimes.com +dropbox.com +weather.com +youtube.com +usps.com +bbc.com +yahoo.com +linkedin.com diff --git a/extras/cloak/ciphers/worldBeaches b/extras/cloak/ciphers/worldBeaches new file mode 100644 index 0000000..ba9d906 --- /dev/null +++ b/extras/cloak/ciphers/worldBeaches @@ -0,0 +1,100 @@ +Balos Beach, Greece +Oludeniz Beach, Turkey +Hanalei Bay, Hawaii, United States +Ffryes Beach, Antigua +Wineglass Bay, Tasmania +Sunrise Beach, Koh Lipe, Thailand +Coffee Bay, Wild Coast, South Africa +Hot Water Beach, Coromandel Peninsula, New Zealand +Bandon, Oregon, United States +Little Corn beaches, Nicaragua +Lover's Beach, Baja California Sur, Mexico +Pulau Derawan, Indonesia +Akajima, Okinawa, Japan +Trunk Bay, St. John, U.S. Virgin Islands +Navagio Beach, Greece +Flamenco Beach, Puerto Rico +Plage de Piémanson, France +Natadola Beach, Fiji +Cayo Paraiso, Dominican Republic +Unawatuna, Sri Lanka +Los Roques, Venezuela +Champagne Beach, Vanuatu +Kaiteriteri Beach, Nelson, New Zealand +Matira Beach, Bora Bora, Tahiti +Anse de Grande Saline, St. Barths +Puka Beach, Boracay, Philippines +Laughing Bird Caye, Belize +El Nido, Palawan, Philippines +Anse Source d'Argent, La Digue, Seychelles +Beidaihe, China +Arashi Beach, Aruba +An Bang Beach, Hoi An, Vietnam +Juara Beach, Tioman Island, Malaysia +D-Day beaches, Normandy, France +Rarotonga, Cook Islands +West Bay Beach, Roatan, Honduras +Cavendish Beach, Prince Edward Island, Canada +Ifaty Beach, Madagascar +Grande Anse Beach, La Digue Island, Seychelles +Diani Beach, Kenya +Dominical Beach, Costa Rica +Bahia Solano, Colombia +Patnem Beach, Goa, India +Tanjung Rhu, Langkawi, Malaysia +Essaouira, Morocco +Tulum, Mexico +Belle Mare, Mauritius +Long Beach, Phu Quoc, Vietnam +Egremni Beach, Greece +Bondi Beach, Sydney, Australia +Isshiki Beach, Hayama, Japan +Paradise Beach, Rab, Croatia +Grace Bay, Providenciales, Turks & Caicos +Abaka Bay, Haiti +Warwick Long Bay, Bermuda +Phra Nang Beach, Railay, Thailand +Karekare, West Auckland, New Zealand +Gardner Bay, Espanola Island, Ecuador +Meads Bay, Anguilla +Panama City Beach, Florida, United States +Boulders Beach, Cape Town, South Africa +La Concha, Spain +Rabbit Beach, Lampedusa, Italy +Byron Bay, Australia +Cape Maclear, Malawi +Southwestern Beach, Koh Rong, Cambodia +Canggu Beach, Bali, Indonesia +Capo Sant'Andrea, Elba, Italy +Cabbage Beach, Paradise Island, Bahamas +Margaret River Beach, Australia +Crane Beach, Barbados +Radhanagar Beach, Andaman Islands, India +Jeffreys Bay, South Africa +Luskentyre Beach, Scotland +Maya Bay, Ko Phi Phi, Thailand +Long Bay, Saint-Martin +Portstewart Strand, Northern Ireland +Vilanculos Beach, Mozambique +Las Salinas, Ibiza, Spain +Grand Anse, Grenada +Sun Island Beach, Maldives +Whitehaven Beach, Queensland, Australia +Placenia Beach, Belize +Pigeon Point, Tobago, Trinidad and Tobago +Punalu'u, Hawaii, United States +The Baths, Virgin Gorda, British Virgin Islands +Porto da Barra, Salvador, Brazil +Nungwi, Zanzibar, Tanzania +Skagen Beach, Denmark +Palaui Island, Cagayan Valley, Philippines +Negril Beach, Jamaica +Falassarna Beach, Crete, Greece +Nihiwatu Beach, Sumba, Indonesia +Playa Paraiso, Cayo Largo, Cuba +Bottom Bay, Barbados +Na'ama Bay, Sharm el Sheikh, Egypt +Haad Rin, Ko Pha Ngan, Thailand +Pulau Perhentian Kecil, Malaysia +Praia do Sancho, Fernando de Noronha, Brazil +Venice Beach, California, United States diff --git a/extras/cloak/ciphers/worldFootballTeams b/extras/cloak/ciphers/worldFootballTeams new file mode 100644 index 0000000..2ce70dd --- /dev/null +++ b/extras/cloak/ciphers/worldFootballTeams @@ -0,0 +1,100 @@ +Celta Vigo Spain +Rangers Scotland +Rosario Central Argentina +Roma Italy +Santos FC Brazil +Dinamo Zagreb Croatia +Málaga Spain +Liverpool FC England +FC Porto Portugal +Sevilla Spain +Al-Ahli Saudi Arabia +Feyenoord Netherlands +Saint-Étienne France +Corinthians Brazil +Borussia Mönchengladbach Germany +Sport Recife Brazil +Everton FC England +Lyon France +Sassuolo Italy +Schalke 04 Germany +Internacional Brazil +Ajax Netherlands +Valencia Spain +Lille France +Villarreal Spain +Real Sociedad Spain +Levadia Tallinn Estonia +Leicester City England +Nice France +Flora Tallinn Estonia +Ludogorets Razgrad Bulgaria +Atlético Madrid Spain +BATE Borisov Belarus +Club Brugge Belgium +Köln Germany +Arsenal England +APOEL Nicosia Cyprus +Anderlecht Belgium +São Paulo Brazil +Salzburg Austria +Dynamo Kyiv Ukraine +América Mexico +Maribor Slovenia +PSV Eindhoven Netherlands +Barcelona Spain +Monaco France +West Ham United England +Wolfsburg Germany +SSC Napoli Italy +Guangzhou Evergrande China PR +Paris Saint Germain France +Crvena Zvezda Serbia +Fenerbahçe Turkey +Boca Juniors Argentina +FC Sheriff Moldova +CSKA Moskva Russia +Manchester United England +AZ Alkmaar Netherlands +Lazio Italy +Inter Milan Italy +Zenit St. Petersburg Russia +Benfica Portugal +Basel Switzerland +Tottenham Hotspur England +Bayer Leverkusen Germany +Estudiantes Argentina +Sporting Portugal +Augsburg Germany +Swansea City England +Genoa Italy +Celtic Scotland +Racing Club Argentina +Olympiakos Greece +Juventus Italy +Grêmio Brazil +Mainz 05 Germany +Sparta Prague Czech Republic +Nomme JK Kalju Estonia +The New Saints Wales +Fiorentina Italy +Borussia Dortmund Germany +Dnipro Dnipropetrovsk Ukraine +Beşiktaş Turkey +Olympique Marseille France +Atlético Mineiro Brazil +Manchester City England +Athletic Bilbao Spain +Viktoria Plzeň Czech Republic +FC Krasnodar Russia +AC Milan Italy +Southampton England +Chelsea England +San Lorenzo Argentina +Independiente Argentina +Atlético Nacional Colombia +Lanús Argentina +Real Madrid Spain +Cruzeiro Brazil +Bayern München Germany +Shakhtar Donetsk Ukraine diff --git a/extras/cloak/cloakify.py b/extras/cloak/cloakify.py new file mode 100644 index 0000000..34894d6 --- /dev/null +++ b/extras/cloak/cloakify.py @@ -0,0 +1,111 @@ +#!/usr/bin/env python3 +# +# Filename: cloakify.py +# +# Version: 1.1.0 +# +# Author: Joe Gervais (TryCatchHCF) +# +# Summary: Exfiltration toolset (see decloakify.py) that transforms any filetype (binaries, +# archives, images, etc.) into lists of words / phrases / Unicode to ease exfiltration of +# data across monitored networks, hiding the data in plain sight. Also facilitates social +# engineering attacks against human analysts and their workflows. Bonus Feature: Defeats +# signature-based malware detection tools (cloak your other tools during an engagement). +# +# Used by cloakifyFactory.py, can be used as a standalone script as well (example below). +# +# Description: Base64-encodes the given payload and translates the output using a list +# of words/phrases/Unicode provided in the cipher. This is NOT a secure encryption tool, +# the output is vulnerable to frequency analysis attacks. Use the Noise Generator scripts +# to add entropy to your cloaked file. You should encrypt the file before cloaking if +# secrecy is needed. +# +# Prepackaged ciphers include: lists of desserts in English, Arabic, Thai, Russian, +# Hindi, Chinese, Persian, and Muppet (Swedish Chef); PokemonGo creatures; Top 100 IP +# Addresses; Top Websites; GeoCoords of World Capitols; MD5 Password Hashes; An Emoji +# cipher; Star Trek characters; Geocaching Locations; Amphibians (Scientific Names); +# evadeAV cipher (simple cipher that minimizes size of the resulting obfuscated data). +# +# To create your own cipher: +# +# - Generate a list of at least 66 unique words (Unicode-16 accepted) +# - Remove all duplicate entries and blank lines +# - Randomize the list (see 'randomizeCipherExample.txt' in Cloakify directory) +# - Provide the file as the cipher argument to the script. +# - ProTip: Place your cipher in the "ciphers/" directory and cloakifyFactory +# will pick it up automatically as a new cipher +# +# Example: +# +# $ ./cloakify.py payload.txt ciphers/desserts > exfiltrate.txt +# + +import argparse +import base64 +import os +import random +import sys + +array64 = list("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789/+=") + +def Cloakify(payloadPath:str, cipherPath:str, outputPath:str="", password:str=None): + """Payload file's binary contents will be read and converted into base64. + Cipher file will be read into a list that will be used for the payload's obfuscation. + If an output path is defined the obfuscated content will be written to that otherwise, + it will print it out to the console. + + Args: + payloadPath (str): Path to the file that will be encoded + cipherPath (str): Path to the file used as the base64 cipher + outputPath (str): Path to write out the obfuscated payload + """ + + try: + with open(payloadPath, 'rb') as payloadFile: + payloadRaw = payloadFile.read() + payloadB64 = base64.encodebytes(payloadRaw) + payloadB64 = payloadB64.decode("ascii").replace("\n", "") + except Exception as e: + print("Error reading payload file {}: {}".format(payloadPath, e)) + + payloadOrdering = None + if password: + random.seed(password) + # Get a list of each line number in the cloaked file + payloadOrdering = [i for i in range(len(payloadB64))] + # Shuffle the order of the lines + random.shuffle(payloadOrdering) + + try: + with open(cipherPath, encoding="utf-8") as file: + cipherArray = file.readlines() + except Exception as e: + print("Error reading cipher file {}: {}".format(cipherPath, e)) + + if outputPath: + try: + with open(outputPath, "w+", encoding="utf-8") as outFile: + if payloadOrdering: + # Iterate through the randomized line order and write each line to the file + for randomLoc in payloadOrdering: + outFile.write(cipherArray[array64.index(payloadB64[randomLoc])]) + else: + for char in payloadB64: + outFile.write(cipherArray[array64.index(char)]) + except Exception as e: + print("Error writing to output file {}: {}".format(outputPath, e)) + + else: + for char in payloadB64: + print(cipherArray[array64.index(char)].strip()) + + +if __name__ == "__main__": + parser = argparse.ArgumentParser(description='Transform file into obfuscated text file.') + parser.add_argument('-i', "--input", type=str, help='Payload File Path', required=True) + parser.add_argument('-c', "--cipher", type=str, help='Cipher File Path', required=True) + parser.add_argument('-o', "--output", type=str, help='Output File Path', default="") + parser.add_argument('-p', "--password", type=str, help='Password', default=None) + args = parser.parse_args() + + Cloakify(args.input, args.cipher, args.output, args.password) diff --git a/extras/cloak/decloakify.py b/extras/cloak/decloakify.py new file mode 100644 index 0000000..285cbf0 --- /dev/null +++ b/extras/cloak/decloakify.py @@ -0,0 +1,84 @@ +#!/usr/bin/env python3 +# +# Filename: decloakify.py +# +# Author: Joe Gervais (TryCatchHCF) +# +# Summary: Exfiltration toolset (see cloakify.py) that transforms data into lists +# of words / phrases / Unicode to ease exfiltration of data across monitored networks, +# essentially hiding the data in plain sight, and facilitate social engineering attacks +# against human analysts and their workflows. Bonus Feature: Defeats signature-based +# malware detection tools (cloak your other tools). +# +# Used by cloakifyFactory.py, can be used as a standalone script as well (example below). +# +# Description: Decodes the output of cloakify.py into its underlying Base64 format, +# then does Base64 decoding to unpack the cloaked payload file. Requires the use of the +# same cipher that was used to cloak the file prior to exfitration, of course. +# +# Prepackaged ciphers include: lists of desserts in English, Arabic, Thai, Russian, +# Hindi, Chinese, Persian, and Muppet (Swedish Chef); Top 100 IP Addresses; GeoCoords of +# World Capitols; MD5 Password Hashes; An Emoji cipher; Star Trek characters; Geocaching +# Locations; Amphibians (Scientific Names); and evadeAV cipher, a simple cipher that +# minimizes the size of the resulting obfuscated data. +# +# Example: +# +# $ ./decloakify.py cloakedPayload.txt ciphers/desserts.ciph + +import argparse +import base64 +import random +import sys + +array64 = list("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789/+=") + +def Decloakify(cloakedPath:str, cipherPath:str, outputPath:str="", password:str=""): + """Cipher file will be read into a list that will be used for the payload's deobfuscation. + Cloaked file's contents will be read in line by line mapping the line to a base64 character. + If an output path is defined the base64 contents will be decoded and written to the output + file otherwise it will be written to the console. + + Args: + cloakedPath (str): Path to the file that is encoded + cipherPath (str): Path to the file used as the base64 cipher + outputPath (str): Path to write out the decoded + """ + with open(cipherPath, encoding="utf-8") as file: + arrayCipher = file.readlines() + + clear64 = "" + with open(cloakedPath, encoding="utf-8") as file: + if password: + random.seed(password) + lines = file.readlines() + # Get a list of each line number in the cloaked file + decodeOrdering = [i for i in range(len(lines))] + # Shuffle the order of the lines to what they were during encoding + random.shuffle(decodeOrdering) + # Map the index of the original payload to the index in the cloaked file + decodeOrdering = {k: v for v, k in enumerate(decodeOrdering)} + # Iterate through the proper line order and reconstruct the unshuffled base64 payload + for i in range(len(lines)): + clear64 += array64[arrayCipher.index(lines[decodeOrdering[i]])] + else: + for line in file: + clear64 += array64[arrayCipher.index(line)] + + payload = base64.b64decode(clear64) + if outputPath: + with open(outputPath, "wb") as outFile: + outFile.write(payload) + else: + print(payload) + + +if __name__ == "__main__": + parser = argparse.ArgumentParser(description='Transform file into unobfuscated text file.') + parser.add_argument('-i', "--input", type=str, help='Cloaked File Path', required=True) + parser.add_argument('-c', "--cipher", type=str, help='Cipher File Path', required=True) + parser.add_argument('-o', "--output", type=str, help='Output File Path', default="") + parser.add_argument('-p', "--password", type=str, help='Password', default=None) + args = parser.parse_args() + + Decloakify(args.input, args.cipher, args.output, args.password) diff --git a/extras/test/80_steganography.sh b/extras/test/80_steganography.sh index f350b9b..12fe37c 100644 --- a/extras/test/80_steganography.sh +++ b/extras/test/80_steganography.sh @@ -65,13 +65,13 @@ fi # GPGRCPT fi # STEGHIDE -if test_have_prereq PYTHON2 CLOAKIFY DECLOAKIFY; then +if test_have_prereq PYTHON3 CLOAKIFY DECLOAKIFY; then test_expect_success 'Testing tomb and steganographic: cloak' ' tt cloak -k $tomb_key $TEST_HOME/cipher-amphibians $tomb_text ' test_expect_success 'Testing tomb and steganographic: uncloak' ' - tt uncloak -k $tomb_key_cloak $tomb_text $TEST_HOME/cipher-amphibians + tt uncloak $tomb_text $TEST_HOME/cipher-amphibians -o $tomb_key_cloak ' fi test_done diff --git a/extras/test/setup b/extras/test/setup index 3a2478d..a7ea7ea 100755 --- a/extras/test/setup +++ b/extras/test/setup @@ -52,7 +52,7 @@ command -v e2fsck resize2fs > /dev/null && test_set_prereq RESIZER command -v tomb-kdb-pbkdf2 > /dev/null && test_set_prereq KDF command -v qrencode > /dev/null && test_set_prereq QRENCODE command -v lsof > /dev/null && test_set_prereq LSOF -command -v python2 > /dev/null && test_set_prereq PYTHON2 +command -v python3 > /dev/null && test_set_prereq PYTHON3 command -v cloakify > /dev/null && test_set_prereq CLOAKIFY command -v decloakify > /dev/null && test_set_prereq DECLOAKIFY command -v sphinx > /dev/null && test_set_prereq SPHINX diff --git a/tomb b/tomb index 15013d8..16603f7 100755 --- a/tomb +++ b/tomb @@ -1837,10 +1837,11 @@ exhume_key() { cloakify_key() { _load_key # Try loading key from option -k and set TOMBKEY - local cipher="$1" # The cipher to use local destfile="$2" # (Optional) the output file where to save the # result (none for stdout) + [[ -r "${cipher}" ]] || + _failure "Cloak cipher file not found, see tomb/extras/cloak/ciphers" _success "Encoding key ::1 tomb key:: using cipher ::2 cipher file::" $TOMBKEYFILE $cipher @@ -1861,7 +1862,7 @@ cloakify_key() { } # Cipher the key - cloakify $TOMBKEYFILE $cipher >$destfile + cloakify -i $TOMBKEYFILE -c $cipher >$destfile if [ $? != 0 ]; then _warning "Encoding error: cloakify reports problems." res=1 @@ -1901,7 +1902,7 @@ decloakify_key() { # Ensure we have a valid destination for the key [[ -z $destkey ]] && { option_is_set -k } && destkey=$(option_value -k) [[ -z $destkey ]] && { - destkey="/dev/stdout" # No key was specified: fallback to stdout + # No key was specified: fallback to stdout _message "printing uncloaked key on stdout" } # Bail out if destination exists, unless -f (force) was passed @@ -1916,11 +1917,15 @@ decloakify_key() { } # Extract the key from the text file - decloakify $textfile $cipher >$destkey + if [[ -z "$destkey" ]]; then + decloakify -i "${textfile}" -c "${cipher}" + else + decloakify -i "${textfile}" -c "${cipher}" -o "${destkey}" + fi r=$? # Report to the user - [[ "$destkey" = "/dev/stdout" ]] && destkey="stdout" + [[ -z "$destkey" ]] && destkey="stdout" [[ $r == 0 ]] && { _success "Key succesfully uncloaked to ::1 key::." $destkey } || {