diff --git a/.gitignore b/.gitignore index 4bf0359..b08f93a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ *.o -*project -*workspace +*.sublime-project +*.sublime-workspace main diff --git a/prj/Matasano.sublime-workspace b/prj/Matasano.sublime-workspace index e22644e..bbdca5f 100644 --- a/prj/Matasano.sublime-workspace +++ b/prj/Matasano.sublime-workspace @@ -539,7 +539,7 @@ "file": "/home/flowher/repos/MatasanoCrypto/src/main.cpp", "settings": { - "buffer_size": 404, + "buffer_size": 378, "line_ending": "Unix" } }, @@ -547,7 +547,7 @@ "file": "/home/flowher/repos/MatasanoCrypto/sol/set2.c", "settings": { - "buffer_size": 7492, + "buffer_size": 7514, "line_ending": "Unix" } }, @@ -555,7 +555,7 @@ "file": "/home/flowher/repos/MatasanoCrypto/src/enc_modes.c", "settings": { - "buffer_size": 6109, + "buffer_size": 6138, "line_ending": "Unix" } }, @@ -579,7 +579,15 @@ "file": "/home/flowher/repos/MatasanoCrypto/src/common.c", "settings": { - "buffer_size": 2911, + "buffer_size": 2941, + "line_ending": "Unix" + } + }, + { + "file": "/home/flowher/repos/MatasanoCrypto/sol/set1.cpp", + "settings": + { + "buffer_size": 12515, "line_ending": "Unix" } }, @@ -587,7 +595,7 @@ "file": "/home/flowher/repos/MatasanoCrypto/src/common.h", "settings": { - "buffer_size": 2306, + "buffer_size": 2279, "line_ending": "Unix" } }, @@ -1043,6 +1051,7 @@ ], "file_history": [ + "/home/flowher/repos/MatasanoCrypto/out", "/home/flowher/repos/MatasanoCrypto/Makefile", "/home/flowher/repos/MatasanoCrypto/src/enc_modes.c", "/home/flowher/repos/OpenCrypto/crypto/evp/evp_enc.c", @@ -1169,8 +1178,7 @@ "/home/kkwiatkowski/storage/91_Repositories/openssl101j/crypto/s390xcpuid.S", "/home/kkwiatkowski/storage/91_Repositories/srp_client_server_implementation_with_openssl/server.cpp", "/home/kkwiatkowski/storage/91_Repositories/openssl101j/include/openssl/symhacks.h", - "/home/kkwiatkowski/storage/91_Repositories/openssl101j/crypto/symhacks.h", - "/home/kkwiatkowski/storage/91_Repositories/openssl101j/ssl/tls_srp.c" + "/home/kkwiatkowski/storage/91_Repositories/openssl101j/crypto/symhacks.h" ], "find": { @@ -1245,6 +1253,13 @@ "case_sensitive": false, "find_history": [ + "==29586==", + "TCASE_E", + "getline", + "getdelim", + "i_buff_ptr", + " uint8_t* i_buff_ptr = (attribs->input)+(bs*i);\n", + "enc_attribs", "exit", "ecb_encrypt_decrypt", "32", @@ -1365,14 +1380,7 @@ "hex_to_base64_text", "run(", "read_file", - "read_file_to_buffer", - "hex_to_base64_text", - "convert_string_to_hex_test", - "utils_tester", - "frequency_set", - "utils_tester", - "set2_", - "int24" + "read_file_to_buffer" ], "highlight": true, "in_selection": false, @@ -1438,7 +1446,7 @@ "groups": [ { - "selected": 4, + "selected": 8, "sheets": [ { @@ -1468,7 +1476,7 @@ "translation.y": 0.0, "zoom_level": 1.0 }, - "stack_index": 7, + "stack_index": 9, "type": "text" }, { @@ -1496,7 +1504,7 @@ "translation.y": 0.0, "zoom_level": 1.0 }, - "stack_index": 11, + "stack_index": 12, "type": "text" }, { @@ -1505,15 +1513,15 @@ "semi_transient": false, "settings": { - "buffer_size": 404, + "buffer_size": 378, "regions": { }, "selection": [ [ - 404, - 404 + 244, + 244 ] ], "settings": @@ -1524,7 +1532,7 @@ "translation.y": 0.0, "zoom_level": 1.0 }, - "stack_index": 3, + "stack_index": 4, "type": "text" }, { @@ -1533,15 +1541,31 @@ "semi_transient": false, "settings": { - "buffer_size": 7492, + "buffer_size": 7514, "regions": { }, "selection": [ [ - 4459, - 4459 + 1120, + 1120 + ], + [ + 1762, + 1762 + ], + [ + 3085, + 3085 + ], + [ + 4035, + 4035 + ], + [ + 5686, + 5686 ] ], "settings": @@ -1551,7 +1575,7 @@ "translate_tabs_to_spaces": true }, "translation.x": 0.0, - "translation.y": 1561.0, + "translation.y": 1423.0, "zoom_level": 1.0 }, "stack_index": 1, @@ -1563,15 +1587,15 @@ "semi_transient": false, "settings": { - "buffer_size": 6109, + "buffer_size": 6138, "regions": { }, "selection": [ [ - 3005, - 3005 + 5822, + 5822 ] ], "settings": @@ -1581,10 +1605,10 @@ "translate_tabs_to_spaces": true }, "translation.x": 0.0, - "translation.y": 626.0, + "translation.y": 2579.0, "zoom_level": 1.0 }, - "stack_index": 0, + "stack_index": 5, "type": "text" }, { @@ -1611,7 +1635,7 @@ "translation.y": 0.0, "zoom_level": 1.0 }, - "stack_index": 5, + "stack_index": 7, "type": "text" }, { @@ -1627,8 +1651,8 @@ "selection": [ [ - 427, - 427 + 352, + 352 ] ], "settings": @@ -1639,7 +1663,7 @@ "translation.y": 0.0, "zoom_level": 1.0 }, - "stack_index": 2, + "stack_index": 6, "type": "text" }, { @@ -1648,15 +1672,15 @@ "semi_transient": false, "settings": { - "buffer_size": 2911, + "buffer_size": 2941, "regions": { }, "selection": [ [ - 124, - 124 + 1027, + 1027 ] ], "settings": @@ -1664,42 +1688,71 @@ "syntax": "Packages/C Improved/C Improved.tmLanguage" }, "translation.x": 0.0, - "translation.y": 2040.0, + "translation.y": 465.0, "zoom_level": 1.0 }, - "stack_index": 9, + "stack_index": 3, "type": "text" }, { "buffer": 8, + "file": "/home/flowher/repos/MatasanoCrypto/sol/set1.cpp", + "semi_transient": false, + "settings": + { + "buffer_size": 12515, + "regions": + { + }, + "selection": + [ + [ + 5301, + 5301 + ] + ], + "settings": + { + "syntax": "Packages/C++/C++.tmLanguage", + "translate_tabs_to_spaces": false + }, + "translation.x": 0.0, + "translation.y": 2360.0, + "zoom_level": 1.0 + }, + "stack_index": 0, + "type": "text" + }, + { + "buffer": 9, "file": "/home/flowher/repos/MatasanoCrypto/src/common.h", "semi_transient": false, "settings": { - "buffer_size": 2306, + "buffer_size": 2279, "regions": { }, "selection": [ [ - 384, - 384 + 279, + 279 ] ], "settings": { "syntax": "Packages/C Improved/C Improved.tmLanguage" }, - "translation.x": 0.0, + "translation.x": -0.0, "translation.y": 0.0, "zoom_level": 1.0 }, - "stack_index": 4, + "stack_index": 2, "type": "text" }, { - "buffer": 9, + "buffer": 10, "file": "/home/flowher/test.cpp", "semi_transient": false, "settings": @@ -1723,11 +1776,11 @@ "translation.y": 0.0, "zoom_level": 1.0 }, - "stack_index": 12, + "stack_index": 13, "type": "text" }, { - "buffer": 10, + "buffer": 11, "file": "/home/flowher/repos/MatasanoCrypto/src/hamming.c", "semi_transient": false, "settings": @@ -1752,11 +1805,11 @@ "translation.y": 0.0, "zoom_level": 1.0 }, - "stack_index": 8, + "stack_index": 10, "type": "text" }, { - "buffer": 11, + "buffer": 12, "file": "/home/flowher/repos/MatasanoCrypto/src/xor_char_finder.cpp", "semi_transient": false, "settings": @@ -1781,11 +1834,11 @@ "translation.y": 1014.0, "zoom_level": 1.0 }, - "stack_index": 6, + "stack_index": 8, "type": "text" }, { - "buffer": 12, + "buffer": 13, "file": "/home/flowher/repos/MatasanoCrypto/sol/etc/set2_t2.txt", "semi_transient": false, "settings": @@ -1809,7 +1862,7 @@ "translation.y": 0.0, "zoom_level": 1.0 }, - "stack_index": 10, + "stack_index": 11, "type": "text" } ] diff --git a/sol/set1.cpp b/sol/set1.cpp index 217f58e..ce0b82a 100644 --- a/sol/set1.cpp +++ b/sol/set1.cpp @@ -179,7 +179,6 @@ TCASE_E TCASE(crack_repeted_xor_test) { - unsigned char error_buf[256]; unsigned char expected_plaintext1[] = "Big bang theory: Ok, go home crazy men. Very well, I can't keep up with this secret anylonger. Ok, you listen to me but it's not any of your bussiness. Got it? Worst bed time story every. Regardless of your feelings I would like to break with this guy."; unsigned char expected_plaintext2[] = "This is an english text that is going to be encrypted with multiple characters. Then I need to write algorithm that will decrypt it. The way to decrypt it is to first calculate hamming distance in order to guess length of the key. This may fail, but maybe will work. So then I'll decrypt it in some fancy way and that's it. It will work, I'm sure about it. OK, now I'm done with this stupid text. Second episode of Big Bang theory is starting.";