X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/b3125340f39856e7d8b3fbdcaeacc0baf0e71336..99789601dcc6c6b347d857fb2d32c9d1ef52d43d:/armsrc/des.c?ds=sidebyside diff --git a/armsrc/des.c b/armsrc/des.c index a81df9c8..172b3235 100644 --- a/armsrc/des.c +++ b/armsrc/des.c @@ -378,59 +378,59 @@ void tdes_dec(void* out, void* in, const uint8_t* key){ des_dec(out, out, (uint8_t*)key + 0); } -void tdes_2key_enc(void* out, const void* in, size_t length, const void* key, unsigned char iv[8]){ + void tdes_2key_enc(void* out, const void* in, size_t length, const void* key, unsigned char iv[8]){ if( length % 8 ) return; - + uint8_t i; uint8_t* tin = (uint8_t*) in; uint8_t* tout = (uint8_t*) out; while( length > 0 ) { - for ( i = 0; i < 8; i++ ) - tout[i] = (unsigned char)(tin[i] ^ iv[i]); - + for( i = 0; i < 8; i++ ) + tout[i] = (unsigned char)( tin[i] ^ iv[i] ); + des_enc(tout, tin, (uint8_t*)key + 0); des_dec(tout, tout, (uint8_t*)key + 8); des_enc(tout, tout, (uint8_t*)key + 0); - memcpy(iv, tout, 8); - + memcpy( iv, tout, 8 ); + tin += 8; tout += 8; length -= 8; } -} - -void tdes_2key_dec(void* out, const void* in, size_t length, const void* key, unsigned char iv[8]){ + } + + void tdes_2key_dec(void* out, const void* in, size_t length, const void* key, unsigned char iv[8]){ if( length % 8 ) return; uint8_t i; unsigned char temp[8]; + uint8_t* tin = (uint8_t*) in; uint8_t* tout = (uint8_t*) out; while( length > 0 ) { - memcpy(temp, tin, 8); - + memcpy( temp, tin, 8 ); + des_dec(tout, tin, (uint8_t*)key + 0); des_enc(tout, tout, (uint8_t*)key + 8); des_dec(tout, tout, (uint8_t*)key + 0); - for (i = 0; i < 8; i++) - tout[i] = (unsigned char)(tout[i] ^ iv[i]); + for( i = 0; i < 8; i++ ) + tout[i] = (unsigned char)( tout[i] ^ iv[i] ); - memcpy(iv, temp, 8); + memcpy( iv, temp, 8 ); tin += 8; tout += 8; length -= 8; } -} - + } /******************************************************************************/