[shacrypt] push by Nightgunner5 - I need to stop doing that.... on 2010-03-13 15:34 GMT

[shac...@googlecode.com]

Revision: a484423a64
Author: Nightgunner5
Date: Sat Mar 13 07:34:32 2010
Log: I need to stop doing that.

s/shuffle/scramble/
http://code.google.com/p/shacrypt/source/detail?r=a484423a64

Modified:
/src/shacrypt.c

=======================================
--- /src/shacrypt.c Sat Mar 13 07:33:04 2010
+++ /src/shacrypt.c Sat Mar 13 07:34:32 2010
@@ -421,7 +421,7 @@
ctx->scramble_sha1_ptr = 0;
SHA1Reset( &ctx->scramble_sha1 );
SHA1Input( &ctx->scramble_sha1, ctx->scramble_sha1_res, 20
);
- SHA1Input( &ctx->scramble_sha1, ctx->shufflekey,
ctx->shufflelen );
+ SHA1Input( &ctx->scramble_sha1, ctx->scramblekey,
ctx->scramblelen );
SHA1Result( &ctx->scramble_sha1, ctx->scramble_sha1_res );
}
c ^= scramble_ctx->sha1_res[ctx->scramble_sha1_ptr];
@@ -433,7 +433,7 @@
ctx->scramble_sha224_ptr = 0;
sha224_init( &ctx->scramble_sha224 );
sha224_update( &ctx->scramble_sha224,
ctx->scramble_sha224_res, 28 );
- sha224_update( &ctx->scramble_sha224, ctx->shufflekey,
ctx->shufflelen );
+ sha224_update( &ctx->scramble_sha224, ctx->scramblekey,
ctx->scramblelen );
sha224_final( &ctx->scramble_sha224,
ctx->scramble_sha224_res );
}
c ^= ctx->scramble_sha224_res[ctx->scramble_sha224_ptr];
@@ -445,7 +445,7 @@
ctx->scramble_sha256_ptr = 0;
sha256_init( &ctx->scramble_sha256 );
sha256_update( &ctx->scramble_sha256,
ctx->scramble_sha256_res, 32 );
- sha256_update( &ctx->scramble_sha256, ctx->shufflekey,
ctx->shufflelen );
+ sha256_update( &ctx->scramble_sha256, ctx->scramblekey,
ctx->scramblelen );
sha256_final( &ctx->scramble_sha256,
ctx->scramble_sha256_res );
}
c ^= ctx->scramble_sha256_res[ctx->scramble_sha256_ptr];
@@ -457,7 +457,7 @@
ctx->scramble_sha384_ptr = 0;
sha384_init( &ctx->scramble_sha384 );
sha384_update( &ctx->scramble_sha384,
ctx->scramble_sha384_res, 48 );
- sha384_update( &ctx->scramble_sha384, ctx->shufflekey,
ctx->shufflelen );
+ sha384_update( &ctx->scramble_sha384, ctx->scramblekey,
ctx->scramblelen );
sha384_final( &ctx->scramble_sha384,
ctx->scramble_sha384_res );
}
c ^= ctx->scramble_sha384_res[ctx->scramble_sha384_ptr];
@@ -469,7 +469,7 @@
ctx->scramble_sha512_ptr = 0;
sha512_init( &ctx->scramble_sha512 );
sha512_update( &ctx->scramble_sha512,
ctx->scramble_sha512_res, 64 );
- sha512_update( &ctx->scramble_sha512, ctx->shufflekey,
ctx->shufflelen );
+ sha512_update( &ctx->scramble_sha512, ctx->scramblekey,
ctx->scramblelen );
sha512_final( &ctx->scramble_sha512,
ctx->scramble_sha512_res );
}
c ^= ctx->scramble_sha512_res[ctx->scramble_sha512_ptr];
@@ -481,7 +481,7 @@
ctx->scramble_md5_ptr = 0;
MD5Init( &ctx->scramble_md5 );
MD5Update( &ctx->scramble_md5, ctx->scramble_md5_res, 16 );
- MD5Update( &ctx->scramble_md5, ctx->shufflekey,
ctx->shufflelen );
+ MD5Update( &ctx->scramble_md5, ctx->scramblekey,
ctx->scramblelen );
MD5Final( ctx->scramble_md5_res, &ctx->scramble_md5 );
}
c ^= ctx->scramble_md5_res[ctx->scramble_md5_ptr];
@@ -493,7 +493,7 @@
ctx->scramble_cube_ptr = 0;
CubeHash_Init( &ctx->scramble_cube, 512 );
CubeHash_Update( &ctx->scramble_cube,
ctx->scramble_cube_res, 512 );
- CubeHash_Update( &ctx->scramble_cube, ctx->shufflekey,
(int)ctx->shufflelen << 3 );
+ CubeHash_Update( &ctx->scramble_cube, ctx->scramblekey,
(int)ctx->scramblelen << 3 );
CubeHash_Final( &ctx->scramble_cube,
ctx->scramble_cube_res );
}
c ^= ctx->scramble_cube_res[ctx->scramble_cube_ptr];
@@ -505,7 +505,7 @@
ctx->scramble_whirlpool_ptr = 0;
NESSIEinit( &ctx->scramble_whirlpool );
NESSIEadd( ctx->scramble_whirlpool_res, 512,
&ctx->scramble_whirlpool );
- NESSIEadd( ctx->shufflekey, (int)ctx->shufflelen << 3,
&ctx->scramble_whirlpool );
+ NESSIEadd( ctx->scramblekey, (int)ctx->scramblelen << 3,
&ctx->scramble_whirlpool );
NESSIEfinalize( &ctx->scramble_whirlpool,
ctx->scramble_whirlpool_res );
}
c ^= ctx->scramble_whirlpool_res[ctx->scramble_whirlpool_ptr];
@@ -540,7 +540,7 @@
ctx->scramble_sha1_ptr = 0;
SHA1Reset( &ctx->scramble_sha1 );
SHA1Input( &ctx->scramble_sha1, ctx->scramble_sha1_res, 20
);
- SHA1Input( &ctx->scramble_sha1, ctx->shufflekey,
ctx->shufflelen );
+ SHA1Input( &ctx->scramble_sha1, ctx->scramblekey,
ctx->scramblelen );
SHA1Result( &ctx->scramble_sha1, ctx->scramble_sha1_res );
}
c ^= scramble_ctx->sha1_res[ctx->scramble_sha1_ptr];
@@ -552,7 +552,7 @@
ctx->scramble_sha224_ptr = 0;
sha224_init( &ctx->scramble_sha224 );
sha224_update( &ctx->scramble_sha224,
ctx->scramble_sha224_res, 28 );
- sha224_update( &ctx->scramble_sha224, ctx->shufflekey,
ctx->shufflelen );
+ sha224_update( &ctx->scramble_sha224, ctx->scramblekey,
ctx->scramblelen );
sha224_final( &ctx->scramble_sha224,
ctx->scramble_sha224_res );
}
c ^= ctx->scramble_sha224_res[ctx->scramble_sha224_ptr];
@@ -564,7 +564,7 @@
ctx->scramble_sha256_ptr = 0;
sha256_init( &ctx->scramble_sha256 );
sha256_update( &ctx->scramble_sha256,
ctx->scramble_sha256_res, 32 );
- sha256_update( &ctx->scramble_sha256, ctx->shufflekey,
ctx->shufflelen );
+ sha256_update( &ctx->scramble_sha256, ctx->scramblekey,
ctx->scramblelen );
sha256_final( &ctx->scramble_sha256,
ctx->scramble_sha256_res );
}
c ^= ctx->scramble_sha256_res[ctx->scramble_sha256_ptr];
@@ -576,7 +576,7 @@
ctx->scramble_sha384_ptr = 0;
sha384_init( &ctx->scramble_sha384 );
sha384_update( &ctx->scramble_sha384,
ctx->scramble_sha384_res, 48 );
- sha384_update( &ctx->scramble_sha384, ctx->shufflekey,
ctx->shufflelen );
+ sha384_update( &ctx->scramble_sha384, ctx->scramblekey,
ctx->scramblelen );
sha384_final( &ctx->scramble_sha384,
ctx->scramble_sha384_res );
}
c ^= ctx->scramble_sha384_res[ctx->scramble_sha384_ptr];
@@ -588,7 +588,7 @@
ctx->scramble_sha512_ptr = 0;
sha512_init( &ctx->scramble_sha512 );
sha512_update( &ctx->scramble_sha512,
ctx->scramble_sha512_res, 64 );
- sha512_update( &ctx->scramble_sha512, ctx->shufflekey,
ctx->shufflelen );
+ sha512_update( &ctx->scramble_sha512, ctx->scramblekey,
ctx->scramblelen );
sha512_final( &ctx->scramble_sha512,
ctx->scramble_sha512_res );
}
c ^= ctx->scramble_sha512_res[ctx->scramble_sha512_ptr];
@@ -600,7 +600,7 @@
ctx->scramble_md5_ptr = 0;
MD5Init( &ctx->scramble_md5 );
MD5Update( &ctx->scramble_md5, ctx->scramble_md5_res, 16 );
- MD5Update( &ctx->scramble_md5, ctx->shufflekey,
ctx->shufflelen );
+ MD5Update( &ctx->scramble_md5, ctx->scramblekey,
ctx->scramblelen );
MD5Final( ctx->scramble_md5_res, &ctx->scramble_md5 );
}
c ^= ctx->scramble_md5_res[ctx->scramble_md5_ptr];
@@ -612,7 +612,7 @@
ctx->scramble_cube_ptr = 0;
CubeHash_Init( &ctx->scramble_cube, 512 );
CubeHash_Update( &ctx->scramble_cube,
ctx->scramble_cube_res, 512 );
- CubeHash_Update( &ctx->scramble_cube, ctx->shufflekey,
(int)ctx->shufflelen << 3 );
+ CubeHash_Update( &ctx->scramble_cube, ctx->scramblekey,
(int)ctx->scramblelen << 3 );
CubeHash_Final( &ctx->scramble_cube,
ctx->scramble_cube_res );
}
c ^= ctx->scramble_cube_res[ctx->scramble_cube_ptr];
@@ -624,7 +624,7 @@
ctx->scramble_whirlpool_ptr = 0;
NESSIEinit( &ctx->scramble_whirlpool );
NESSIEadd( ctx->scramble_whirlpool_res, 512,
&ctx->scramble_whirlpool );
- NESSIEadd( ctx->shufflekey, (int)ctx->shufflelen << 3,
&ctx->scramble_whirlpool );
+ NESSIEadd( ctx->scramblekey, (int)ctx->scramblelen << 3,
&ctx->scramble_whirlpool );
NESSIEfinalize( &ctx->scramble_whirlpool,
ctx->scramble_whirlpool_res );
}
c ^= ctx->scramble_whirlpool_res[ctx->scramble_whirlpool_ptr];