libaacs | branch: master | npzacs <npz...@gmail.com> | Mon Oct 7 11:35:01 2013 +0300| [7e1038cc10b34ef267332e684391c1d951b59b9a] | committer: npzacs
_decrypt_bus(): Avoid memcpy (bus decryption can't be retried with another key) - we have only one key - data is still encrypted and can't be verified > http://git.videolan.org/gitweb.cgi/libaacs.git/?a=commit;h=7e1038cc10b34ef267332e684391c1d951b59b9a --- src/libaacs/aacs.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/libaacs/aacs.c b/src/libaacs/aacs.c index 089715e..ffa4fcb 100644 --- a/src/libaacs/aacs.c +++ b/src/libaacs/aacs.c @@ -812,16 +812,14 @@ static int _decrypt_unit(AACS *aacs, uint8_t *out_buf, const uint8_t *in_buf, ui } #define SECTOR_LEN 2048 -static void _decrypt_bus(AACS *aacs, uint8_t *out_buf, const uint8_t *in_buf) +static void _decrypt_bus(AACS *aacs, uint8_t *buf) { gcry_cipher_hd_t gcry_h; - memcpy(out_buf, in_buf, 16); /* first 16 bytes are plain */ - gcry_cipher_open(&gcry_h, GCRY_CIPHER_AES, GCRY_CIPHER_MODE_CBC, 0); gcry_cipher_setkey(gcry_h, aacs->read_data_key, 16); gcry_cipher_setiv(gcry_h, aacs_iv, 16); - gcry_cipher_decrypt(gcry_h, out_buf + 16, SECTOR_LEN - 16, in_buf + 16, SECTOR_LEN - 16); + gcry_cipher_decrypt(gcry_h, buf + 16, SECTOR_LEN - 16, NULL, 0); gcry_cipher_close(gcry_h); } @@ -930,9 +928,8 @@ int aacs_decrypt_unit(AACS *aacs, uint8_t *buf) if (aacs->bee && aacs->bec) { for (i = 0; i < ALIGNED_UNIT_LEN; i += SECTOR_LEN) { - _decrypt_bus(aacs, out_buf + i, buf + i); + _decrypt_bus(aacs, buf + i); } - memcpy(buf, out_buf, ALIGNED_UNIT_LEN); } if (_decrypt_unit(aacs, out_buf, buf, aacs->current_cps_unit)) { _______________________________________________ libaacs-devel mailing list libaacs-devel@videolan.org https://mailman.videolan.org/listinfo/libaacs-devel
