diff options
| author | George Hazan <george.hazan@gmail.com> | 2015-08-27 21:42:44 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2015-08-27 21:42:44 +0000 |
| commit | 17501083ca15adc9e3f53757b47a961ed2e77e9c (patch) | |
| tree | e6a88938fd555265d20bf4281765c84fb874bc18 /src/core | |
| parent | 18fb3c2f6c84e3242df27a8686da95658584f7a8 (diff) | |
warning fixes
git-svn-id: http://svn.miranda-ng.org/main/trunk@15051 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/stdcrypt/src/Rijndael.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/core/stdcrypt/src/Rijndael.cpp b/src/core/stdcrypt/src/Rijndael.cpp index 752fde4fbd..3f5ff72cfa 100644 --- a/src/core/stdcrypt/src/Rijndael.cpp +++ b/src/core/stdcrypt/src/Rijndael.cpp @@ -1006,13 +1006,13 @@ int CRijndael::MakeKey(BYTE const* key, char const* chain, int keylength, int bl *(pi++) |= *(pc++);
}
//Copy values into round key arrays
- int t = 0;
- for (j = 0; (j < KC) && (t < ROUND_KEY_COUNT); j++, t++) {
- m_Ke[t / BC][t%BC] = tk[j];
- m_Kd[m_iROUNDS - (t / BC)][t%BC] = tk[j];
+ int t1 = 0;
+ for (j = 0; (j < KC) && (t1 < ROUND_KEY_COUNT); j++, t1++) {
+ m_Ke[t1 / BC][t1%BC] = tk[j];
+ m_Kd[m_iROUNDS - (t1 / BC)][t1%BC] = tk[j];
}
int tt, rconpointer = 0;
- while (t < ROUND_KEY_COUNT) {
+ while (t1 < ROUND_KEY_COUNT) {
//Extrapolate using phi (the round key evolution function)
tt = tk[KC - 1];
tk[0] ^= (sm_S[(tt >> 16) & 0xFF] & 0xFF) << 24 ^
@@ -1036,9 +1036,9 @@ int CRijndael::MakeKey(BYTE const* key, char const* chain, int keylength, int bl }
//Copy values into round key arrays
- for (j = 0; (j < KC) && (t < ROUND_KEY_COUNT); j++, t++) {
- m_Ke[t / BC][t%BC] = tk[j];
- m_Kd[m_iROUNDS - (t / BC)][t%BC] = tk[j];
+ for (j = 0; (j < KC) && (t1 < ROUND_KEY_COUNT); j++, t1++) {
+ m_Ke[t1 / BC][t1%BC] = tk[j];
+ m_Kd[m_iROUNDS - (t1 / BC)][t1%BC] = tk[j];
}
}
|