X-Git-Url: https://git.njae.me.uk/?a=blobdiff_plain;f=2013%2Fsolutions.txt;h=fbf7502f1351a20e582db82b49c79ad2cc692f62;hb=a9d938167b636e599586ebbc5aeec75c877e120f;hp=b54c58f0f9bbb8bcdb1f0ee8d438f6def2d219bb;hpb=afc6b4e900c2215e205ea97d191dd5b78619d250;p=cipher-tools.git

diff --git a/2013/solutions.txt b/2013/solutions.txt
index b54c58f..fbf7502 100644
--- a/2013/solutions.txt
+++ b/2013/solutions.txt
@@ -1,13 +1,31 @@
-1a: caesar_decipher(c1a, 8)
-1b: caesar_decipher(c1b, 14)
-2a: affine_decipher(c2a, 3, 3, True)
-2b: caesar_decipher(c2b, 6)
-3a: affine_decipher(c3a, 7, 8, True)
 # with open('2013/mona-lisa-words.txt') as f: mona_lisa_words = [line.rstrip() for line in f]
 # keyword_break(c4a, wordlist=mona_lisa_words)
-3b: keyword_decipher(c3b, 'louvigny', 2)
-4a: keyword_decipher(c4a, 'montal', 2)
-4b: keyword_decipher(c4b, 'salvation', 2)
-5a: keyword_decipher(c5a, 'alfredo', 2)
-5b: vigenere_decipher(c5bs, 'florence')
+
+c1a = open('2013/1a.ciphertext').read()
+c1b = open('2013/1b.ciphertext').read()
+c2a = open('2013/2a.ciphertext').read()
+c2b = open('2013/2b.ciphertext').read()
+c3a = open('2013/3a.ciphertext').read()
+c3b = open('2013/3b.ciphertext').read()
+c4a = open('2013/4a.ciphertext').read()
+c4b = open('2013/4b.ciphertext').read()
+c5a = open('2013/5a.ciphertext').read()
+c5b = open('2013/5b.ciphertext').read()
+c6a = open('2013/6a.ciphertext').read()
+c6b = open('2013/6b.ciphertext').read()
+c7a = open('2013/6a.ciphertext').read()
+c7b = open('2013/6b.ciphertext').read()
+
+p1a = caesar_decipher(c1a, 8)
+p1b = caesar_decipher(c1b, 14)
+p2a = affine_decipher(c2a, 3, 3, True)
+p2b = caesar_decipher(c2b, 6)
+p3a = affine_decipher(c3a, 7, 8, True)
+p3b = keyword_decipher(c3b, 'louvigny', 2)
+p4a = keyword_decipher(c4a, 'montal', 2)
+p4b = keyword_decipher(c4b, 'salvation', 2)
+p5a = keyword_decipher(c5a, 'alfredo', 2)
+p5b = vigenere_decipher(sanitise(c5b), 'florence')
+p6a = keyword_decipher(c6a, 'parishighcommand', 2)
+p7a = vigenere_decipher(sanitise(c7a), 'hp')