Aes descramble support #439
Conversation
…into aes_descrambler Merge latest changes
| ${BUILDDIR}/src/descrambler/ffdecsa/ffdecsa_sse2.o : CFLAGS += -msse2 | ||
| SRCS-yes += src/descrambler/libaesdec/libaesdec_interface.c \ | ||
| src/descrambler/libaesdec/libaesdec.c | ||
| ${BUILDDIR}/src/descrambler/libaesdec/libaesdec.o : CFLAGS += -msse2 |
There was a problem hiding this comment.
Remove this line. The CPU-intensive AES functions are implemented in the openssl libs. No extra CFLAGS necessary.
|
OK, I tried to describe what I think, but I ended with the code.. Please, make your changes on top of 4bf8754 . I created some empty functions / blocks for AES and also the cwc.c should be enhanced for AES support.. The patch should be self-explaining, but if you have any questions, ask... |
| @@ -300,6 +300,9 @@ ${BUILDDIR}/src/descrambler/ffdecsa/ffdecsa_mmx.o : CFLAGS += -mmmx | |||
| ${BUILDDIR}/src/descrambler/ffdecsa/ffdecsa_sse2.o : CFLAGS += -msse2 | |||
| endif | |||
|
|
|||
| # libaesdec | |||
| SRCS-yes += src/descrambler/libaesdec/libaesdec.c | |||
There was a problem hiding this comment.
This should be SRCS-${CONFIG_SSL} += ....
|
Thank you for your comments, I updated the code as you requested. Do you think it is acceptable now? |
| @@ -28,7 +28,8 @@ static void | |||
| tvhcsa_aes_descramble | |||
| ( tvhcsa_t *csa, struct mpegts_service *s, const uint8_t *tsb ) | |||
| { | |||
| /* Not Implemented Yet */ | |||
| aes_decrypt_packet(csa->csa_aes_keys, (unsigned char *)tsb); | |||
|
@spdfrk1 : We are close to merge... |
|
Haha, thank you for your patience! I updated the indentation and added static inline for the empty functions. |
|
Also just signed the CLA, sorry about not doing that earlier. |
|
Hmm, I signed it and needed to add a stray username (using Linux git can cause github to think I am another user?), but I still see some failures to merge. |
|
Pulled, merged, rebased... The code is in the tvh master tree. Thanks. |
A first effort to get AES descrambling working in TvHeadend. For now it just replaces ffdecsa but this will be corrected.