Index: main-pp.c =================================================================== --- main-pp.c (revision 14432) +++ main-pp.c (working copy) @@ -175,16 +175,7 @@ dest += 8; /* Now increment the key */ - key[0]++; - if (key[0]==0) { - key[1]++; - if (key[1]==0) { - key[2]++; - if (key[2]==0) { - key[3]++; - } - } - } + ++key[0] || ++key[1] || ++key[2] || ++key[3]; } } @@ -227,17 +218,8 @@ key[3] = tea_keytable[i].key[3]; /* Now increment the key */ - for(j=0; j<((magic_location-mi4header->plaintext)/8); j++){ - key[0]++; - if (key[0]==0) { - key[1]++; - if (key[1]==0) { - key[2]++; - if (key[2]==0) { - key[3]++; - } - } - } + for (j = ((magic_location - mi4header->plaintext) / 8); j > 0; j--) { + ++key[0] || ++key[1] || ++key[2] || ++key[3]; } if (tea_test_key(magic_enc,key,unaligned))