Fix some typos. diff --git a/run/dynamic.conf b/run/dynamic.conf index 7ee8f5c..1e8dfe3 100644 --- a/run/dynamic.conf +++ b/run/dynamic.conf @@ -186,7 +186,7 @@ Test=$dynamic_1007$de56b00bb15d6db79204bd44383469bc$T &:thatsworking Test=$dynamic_1007$fb685c6f469f6e549c85e4c1fb5a65a6$HEX$5C483A:test3 #################################################################### -# Dynamic type for algorithm used in RADIUS User-Password attrinute md5($p.$s) +# Dynamic type for algorithm used in RADIUS User-Password attribute md5($p.$s) #################################################################### [List.Generic:dynamic_1008] # expression shown will be this string: diff --git a/src/agilekeychain_fmt_plug.c b/src/agilekeychain_fmt_plug.c index 205f818..1197d93 100644 --- a/src/agilekeychain_fmt_plug.c +++ b/src/agilekeychain_fmt_plug.c @@ -163,7 +163,7 @@ static int akcdecrypt(unsigned char *derived_key, unsigned char *data) memcpy(iv, data + CTLEN - 32, 16); if(AES_set_decrypt_key(derived_key, 128, &akey) < 0) { - fprintf(stderr, "AES_set_derypt_key failed in crypt!\n"); + fprintf(stderr, "AES_set_decrypt_key failed in crypt!\n"); } AES_cbc_encrypt(data + CTLEN - 16, out + CTLEN - 16, 16, &akey, iv, AES_DECRYPT); diff --git a/src/common.h b/src/common.h index 102d5d4..05141f2 100644 --- a/src/common.h +++ b/src/common.h @@ -22,7 +22,7 @@ typedef unsigned long long ARCH_WORD_64; #endif /* ONLY use this to check alignments of even power of 2 (2, 4, 8, 16, etc) byte counts (CNT). - the cast to void* MUST be done, due to C spec. http://stackoverflow.com/a/1898487 */ + The cast to void* MUST be done, due to C spec. http://stackoverflow.com/a/1898487 */ #define is_aligned(PTR, CNT) ((((ARCH_WORD)(const void *)(PTR))&(CNT-1))==0) #ifdef __GNUC__ diff --git a/src/keepass_fmt_plug.c b/src/keepass_fmt_plug.c index cbaf6a8..82c0062 100644 --- a/src/keepass_fmt_plug.c +++ b/src/keepass_fmt_plug.c @@ -83,7 +83,7 @@ static void transform_key(char *masterkey, struct custom_salt *csp, unsigned cha } memset(&akey, 0, sizeof(AES_KEY)); if(AES_set_encrypt_key(csp->transf_randomseed, 256, &akey) < 0) { - fprintf(stderr, "AES_set_derypt_key failed!\n"); + fprintf(stderr, "AES_set_encrypt_key failed!\n"); } // Next, encrypt the created hash i = csp->key_transf_rounds >> 2; @@ -330,7 +330,7 @@ static void crypt_all(int count) memcpy(iv, cur_salt->enc_iv, 16); memset(&akey, 0, sizeof(AES_KEY)); if(AES_set_decrypt_key(final_key, 256, &akey) < 0) { - fprintf(stderr, "AES_set_derypt_key failed in crypt!\n"); + fprintf(stderr, "AES_set_decrypt_key failed in crypt!\n"); } if(cur_salt->version == 1) { AES_cbc_encrypt(cur_salt->contents, decrypted_content, cur_salt->contentsize, &akey, iv, AES_DECRYPT); diff --git a/src/keyring_fmt_plug.c b/src/keyring_fmt_plug.c index 81a8cc0..3f1f40a 100644 --- a/src/keyring_fmt_plug.c +++ b/src/keyring_fmt_plug.c @@ -220,7 +220,7 @@ static void decrypt_buffer(unsigned char *buffer, unsigned int len, memset(&akey, 0, sizeof(AES_KEY)); if (AES_set_decrypt_key(key, 128, &akey) < 0) { - fprintf(stderr, "AES_set_derypt_key failed!\n"); + fprintf(stderr, "AES_set_decrypt_key failed!\n"); } AES_cbc_encrypt(buffer, buffer, len, &akey, iv, AES_DECRYPT); } diff --git a/src/lastpass_sniffed_fmt_plug.c b/src/lastpass_sniffed_fmt_plug.c index 765a344..f67972f 100644 --- a/src/lastpass_sniffed_fmt_plug.c +++ b/src/lastpass_sniffed_fmt_plug.c @@ -155,7 +155,7 @@ static void crypt_all(int count) pbkdf2_sha256((unsigned char*)saved_key[index], strlen(saved_key[index]), (unsigned char*)cur_salt->username, strlen((char*)cur_salt->username), cur_salt->iterations, key); if(AES_set_decrypt_key((const unsigned char *)key, 256, &akey) < 0) { - fprintf(stderr, "AES_set_derypt_key failed in crypt!\n"); + fprintf(stderr, "AES_set_decrypt_key failed in crypt!\n"); } AES_cbc_encrypt(cur_salt->encrypted_username, out, 32, &akey, iv, AES_DECRYPT); diff --git a/src/mscash2_fmt_plug.c b/src/mscash2_fmt_plug.c index c5cad4f..9eb656b 100644 --- a/src/mscash2_fmt_plug.c +++ b/src/mscash2_fmt_plug.c @@ -27,16 +27,16 @@ * - increased salt (user name) upto 22 UC2 characters. Bug in original code only allowed up to 8 chars. * - Added SSE2(/MMX) and SSE2i to the deep inner loop. 2x to 4x speedup. * - total about 2x to 10x improvment in speed (depending upon CPU and compiler). Some compilers - * were more efficient with orinal code, and thus received less of a performance boost. Others + * were more efficient with original code, and thus received less of a performance boost. Others * got a signicant improvment. * - The utf8 code was greatly simplified. There was no reason to try to optimized the UTF code as - * the format is so slow that utf8 conversion is a non-issue. Thus the we always call the enc_to_utf16() + * the format is so slow that utf8 conversion is a non-issue. Thus we always call the enc_to_utf16() * at the proper locations, and let that function deal with being in --encoding=utf8 switch mode or not. * - Fixed code to properly work with BE systems, and alignment required systems. * - Made some 'interface' changes to the SSE2i for SHA1, and to the sha-mmx.S code, to make it work * properly, and to make it more efficient. We deal with 2 SHA1 states, and alternate back and forth * between them. The changes to the SSE2i code, were to optimize this dual state, and the changes - * to the .S code were simply to make it work at all and the same optimizations were place there. + * to the .S code were simply to make it work at all and the same optimizations were placed there. * - the OMP code was removed during initial re-write, and was properly re-incorporated by magnum. * * This module is based on: @@ -44,7 +44,7 @@ * - RFC 1320 - The MD4 Message-Digest Algorithm * - RFC 2104 - HMAC: Keyed-Hashing for Message Authentication * - RFC 3174 - US Secure Hash Algorithm 1 (SHA1) - * - the HMAC-SHA1 implementation of the PolarSSL open source cryptagraphic library (http://polarssl.org/) + * - the HMAC-SHA1 implementation of the PolarSSL open source cryptographic library (http://polarssl.org/) */ #include @@ -505,7 +505,7 @@ static int salt_hash(void *salt) #ifdef MMX_COEF // NOTE, in the end, this block will move above the pbkdf2() function, and the #else and #endif wrapping that function will be -// uncommented. Thus, if built for SSE2 (mmx, or intrisic), we get this function. Otherwise we get teh pbkdf2() function which +// uncommented. Thus, if built for SSE2 (mmx, or intrisic), we get this function. Otherwise we get the pbkdf2() function which // uses OpenSSL. However to get the 'layout' right, The code here will walk through the array buffer, calling the pbkdf2 // function. static void pbkdf2_sse2(int t) diff --git a/src/opencl_agilekeychain_fmt.c b/src/opencl_agilekeychain_fmt.c index d5184f8..d167958 100644 --- a/src/opencl_agilekeychain_fmt.c +++ b/src/opencl_agilekeychain_fmt.c @@ -285,7 +285,7 @@ static int akcdecrypt(unsigned char *derived_key, unsigned char *data) memcpy(iv, data + CTLEN - 32, 16); if(AES_set_decrypt_key(derived_key, 128, &akey) < 0) { - fprintf(stderr, "AES_set_derypt_key failed in crypt!\n"); + fprintf(stderr, "AES_set_decrypt_key failed in crypt!\n"); } AES_cbc_encrypt(data + CTLEN - 16, out + CTLEN - 16, 16, &akey, iv, AES_DECRYPT); diff --git a/src/opencl_strip_fmt.c b/src/opencl_strip_fmt.c index e19518d..807a7e9 100644 --- a/src/opencl_strip_fmt.c +++ b/src/opencl_strip_fmt.c @@ -332,7 +332,7 @@ static void crypt_all(int count) memcpy(iv_out, iv_in, 16); if (AES_set_decrypt_key(master, 256, &akey) < 0) { - fprintf(stderr, "AES_set_derypt_key failed!\n"); + fprintf(stderr, "AES_set_decrypt_key failed!\n"); } /* decrypting 24 bytes is enough */ AES_cbc_encrypt(cur_salt->data + 16, output + 16, 24, &akey, iv_out, AES_DECRYPT); diff --git a/src/putty_fmt_plug.c b/src/putty_fmt_plug.c index f2b02a1..da0677b 100644 --- a/src/putty_fmt_plug.c +++ b/src/putty_fmt_plug.c @@ -258,7 +258,7 @@ static int LAME_ssh2_load_userkey(char *passphrase) memset(iv, 0, 32); memset(&akey, 0, sizeof(AES_KEY)); if(AES_set_decrypt_key(key, 256, &akey) < 0) { - fprintf(stderr, "AES_set_derypt_key failed!\n"); + fprintf(stderr, "AES_set_decrypt_key failed!\n"); } AES_cbc_encrypt(cur_salt->private_blob, out , cur_salt->private_blob_len, &akey, iv, AES_DECRYPT); } diff --git a/src/rawSHA1_ng_fmt.c b/src/rawSHA1_ng_fmt.c index 3bc45ed..44e7600 100644 --- a/src/rawSHA1_ng_fmt.c +++ b/src/rawSHA1_ng_fmt.c @@ -305,7 +305,7 @@ static void sha1_fmt_set_key(char *key, int index) uint32_t len = _mm_movemask_epi8(_mm_cmpeq_epi8(X, Z)); // Create a lookup tables to find correct masks for each supported input - // length. It would be nice if could use 128 bit shifts to produce these + // length. It would be nice if we could use 128 bit shifts to produce these // dynamically, but they require an immediate operand. static const __aligned_16 uint32_t kTrailingBitTable[][4] = { { 0x00000080, 0x00000000, 0x00000000, 0x00000000 }, diff --git a/src/sha2.c b/src/sha2.c index c52725b..7a68c96 100644 --- a/src/sha2.c +++ b/src/sha2.c @@ -31,7 +31,7 @@ static const unsigned char padding[128] = { 0x80, 0 /* 0,0,0,0.... */ }; -// I wish C++ had a good 'known' ror command :( Hopefully the copilers will be nice with this one. +// I wish C++ had a good 'known' ror command :( Hopefully the compilers will be nice with this one. // GCC seems to do a good job of converting into roll, which is 'good' enough. The rotates are the // 'wrong' direction (rol(x,32-y) vs ror(x,y)), but that's not is a problem, same cycle count. #define ROR32(x,n) ((x>>n)|(x<<(32-n))) diff --git a/src/strip_fmt_plug.c b/src/strip_fmt_plug.c index d87074a..426b245 100644 --- a/src/strip_fmt_plug.c +++ b/src/strip_fmt_plug.c @@ -186,7 +186,7 @@ static void crypt_all(int count) memcpy(iv_out, iv_in, 16); if (AES_set_decrypt_key(master, 256, &akey) < 0) { - fprintf(stderr, "AES_set_derypt_key failed!\n"); + fprintf(stderr, "AES_set_decrypt_key failed!\n"); } /* decrypting 24 bytes is enough */ AES_cbc_encrypt(cur_salt->data + 16, output + 16, 24, &akey, iv_out, AES_DECRYPT); diff --git a/src/truecrypt_fmt.c b/src/truecrypt_fmt.c index ecae210..592a718 100644 --- a/src/truecrypt_fmt.c +++ b/src/truecrypt_fmt.c @@ -255,7 +255,7 @@ static int cmp_one(void* binary, int index) // printf("Real: %i %i %i %i Decrypt: %i %i %i %i\n", (int)know_crc32[0], (int)know_crc32[1], (int)know_crc32[2], (int)know_crc32[3], // (int)crc32[0], (int)crc32[1], (int)crc32[2], (int)crc32[3]); - // TODO: Not use this code, use the commented up + // TODO: Do not use this code, use the commented up if(!first_block_dec[12] && !first_block_dec[13] && !first_block_dec[14] && !first_block_dec[15]) return 1; }