commit 3886f078222dd5ad7d163613aeafa0579ecc42b5 parent 537195233bef28dbfecfddd536133b21ee8860a8 Author: mpizzzle <michael.770211@gmail.com> Date: Sun, 15 Oct 2017 14:28:17 +0100 merge from head Diffstat:
| M | set1/detect_single_character_xor_char_frequency.py | | | 6 | +----- |
| M | set1/single_byte_xor_cipher_char_frequency.py | | | 17 | ++++++----------- |
2 files changed, 7 insertions(+), 16 deletions(-)
diff --git a/set1/detect_single_character_xor_char_frequency.py b/set1/detect_single_character_xor_char_frequency.py @@ -9,11 +9,7 @@ candidate_frequency = 0 for hex in hex_strings: for plaintext in [''.join([chr(x ^ ord(a)) for a in hex.decode("hex")]) for x in range(128)]: - frequency = 0 - - for char in plaintext: - if char in frequent_letters: - frequency += 1 + frequency = sum([plaintext.count(frequent_letters[n]) for n in range(len(frequent_letters))]) if frequency > candidate_frequency: candidate = plaintext diff --git a/set1/single_byte_xor_cipher_char_frequency.py b/set1/single_byte_xor_cipher_char_frequency.py @@ -6,14 +6,10 @@ candidate = "" candidate_frequency = 0 for plaintext in [''.join([chr(x ^ ord(a)) for a in hex.decode("hex")]) for x in range(128)]: - frequency = 0 + frequency = sum([plaintext.count(frequent_letters[n]) for n in range(len(frequent_letters))]) - for char in plaintext: - if char in frequent_letters: - frequency += 1 - - if frequency > candidate_frequency: - candidate = plaintext - candidate_frequency = frequency - -print candidate- \ No newline at end of file + if frequency > candidate_frequency: + candidate = plaintext + candidate_frequency = frequency + +print candidate