From 3340ad20a831cbb74f2ae9865ea5b5fc6dbae34a Mon Sep 17 00:00:00 2001 From: spdfrk1 Date: Tue, 5 Aug 2014 22:20:46 +0200 Subject: [PATCH] Correct indentation --- src/descrambler/libaesdec/libaesdec.c | 114 +++++++++++++------------- 1 file changed, 56 insertions(+), 58 deletions(-) diff --git a/src/descrambler/libaesdec/libaesdec.c b/src/descrambler/libaesdec/libaesdec.c index f7eb8381..3bd30245 100755 --- a/src/descrambler/libaesdec/libaesdec.c +++ b/src/descrambler/libaesdec/libaesdec.c @@ -16,91 +16,89 @@ //-----key structure struct aes_keys_t { - AES_KEY even; - AES_KEY odd; + AES_KEY even; + AES_KEY odd; }; //-----even cw represents one full 128-bit AES key void aes_set_even_control_word(void *keys, const unsigned char *pk) { - AES_set_decrypt_key(pk, 128, &((struct aes_keys_t *) keys)->even); + AES_set_decrypt_key(pk, 128, &((struct aes_keys_t *) keys)->even); } //-----odd cw represents one full 128-bit AES key void aes_set_odd_control_word(void *keys, const unsigned char *pk) { - AES_set_decrypt_key(pk, 128, &((struct aes_keys_t *) keys)->odd); + AES_set_decrypt_key(pk, 128, &((struct aes_keys_t *) keys)->odd); } //-----set control words void aes_set_control_words(void *keys, const unsigned char *ev, const unsigned char *od) { - AES_set_decrypt_key(ev, 128, &((struct aes_keys_t *) keys)->even); - AES_set_decrypt_key(od, 128, &((struct aes_keys_t *) keys)->odd); + AES_set_decrypt_key(ev, 128, &((struct aes_keys_t *) keys)->even); + AES_set_decrypt_key(od, 128, &((struct aes_keys_t *) keys)->odd); } //-----allocate key structure void * aes_get_key_struct(void) { - struct aes_keys_t *keys = (struct aes_keys_t *) malloc( + struct aes_keys_t *keys = (struct aes_keys_t *) malloc( sizeof(struct aes_keys_t)); - if (keys) { - static const unsigned char pk[16] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; - aes_set_control_words(keys, pk, pk); - } - return keys; + if (keys) { + static const unsigned char pk[16] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; + aes_set_control_words(keys, pk, pk); + } + return keys; } //-----free key structure void aes_free_key_struct(void *keys) { - if (keys) - free(keys); + if (keys) + free(keys); } //----- decrypt void aes_decrypt_packet(void *keys, unsigned char *packet) { - unsigned char *pkt; - unsigned char ev_od = 0; - int xc0, offset, n; - int len; - pkt = packet; - AES_KEY k; + unsigned char *pkt; + unsigned char ev_od = 0; + int xc0, offset, n; + int len; + pkt = packet; + AES_KEY k; - xc0 = pkt[3] & 0xc0; - //skip clear pkt - if (xc0 == 0x00) { - return; - } - //skip reserved pkt - if (xc0 == 0x40) { - return; - } - if (xc0 == 0x80 || xc0 == 0xc0) { // encrypted - ev_od = (xc0 & 0x40) >> 6; // 0 even, 1 odd - pkt[3] &= 0x3f; // consider it decrypted now - if (pkt[3] & 0x20) { // incomplete packet - offset = 4 + pkt[4] + 1; - len = 188 - offset; - n = len >> 3; - if (n == 0) { // decrypted==encrypted! - return; // this doesn't need more processing - } - } - else { - len = 184; - offset = 4; - } - } - else { - return; - } + xc0 = pkt[3] & 0xc0; + //skip clear pkt + if (xc0 == 0x00) { + return; + } + //skip reserved pkt + if (xc0 == 0x40) { + return; + } + if (xc0 == 0x80 || xc0 == 0xc0) { // encrypted + ev_od = (xc0 & 0x40) >> 6; // 0 even, 1 odd + pkt[3] &= 0x3f; // consider it decrypted now + if (pkt[3] & 0x20) { // incomplete packet + offset = 4 + pkt[4] + 1; + len = 188 - offset; + n = len >> 3; + if (n == 0) { // decrypted==encrypted! + return; // this doesn't need more processing + } + } else { + len = 184; + offset = 4; + } + } else { + return; + } - if (ev_od == 0) { - k = ((struct aes_keys_t *) keys)->even; - } else { - k = ((struct aes_keys_t *) keys)->odd; - } + if (ev_od == 0) { + k = ((struct aes_keys_t *) keys)->even; + } else { + k = ((struct aes_keys_t *) keys)->odd; + } - // TODO room for improvement? - int i; - for (i = offset; i <= (len - 16); i += 16) { - AES_ecb_encrypt(pkt + i, pkt + i, &k, AES_DECRYPT); - } + // TODO room for improvement? + int i; + for (i = offset; i <= (len - 16); i += 16) { + AES_ecb_encrypt(pkt + i, pkt + i, &k, AES_DECRYPT); + } }