summaryrefslogtreecommitdiff
path: root/libavutil/xtea.c
Commit message (Collapse)AuthorAge
* xtea: give constants the correct typeMichael Niedermayer2012-10-08
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit '29abb04e73b0580ebe38703cadb988d26df6a76a'Michael Niedermayer2012-10-04
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '29abb04e73b0580ebe38703cadb988d26df6a76a': libspeexdec: If the channel count is not valid, decode as stereo. libspeexdec: improve setting of Speex mode and sample rate libspeex: Add a private option for enabling VAD xtea: Test inplace decryption xtea: Fix CBC decryption when src==dst xtea: Factorize testing into a separate function configure: Refactor HAVE_ options available on the command line avconv/avprobe: Add missing 'void' to exit_program() definition Allow use of strncpy() blowfish: Add more tests blowfish: Fix CBC decryption with dst==src blowfish: Factorize testing into a separate function Conflicts: configure libavcodec/libspeexdec.c libavutil/xtea.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * xtea: Test inplace decryptionMichael Niedermayer2012-10-03
| | | | | | | | | | | | Based on test code by: Giorgio Vazzana <mywing81@gmail.com> Signed-off-by: Martin Storsjö <martin@martin.st>
| * xtea: Fix CBC decryption when src==dstMichael Niedermayer2012-10-03
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * xtea: Factorize testing into a separate functionMartin Storsjö2012-10-03
| | | | | | | | | | | | Based on a patch by Michael Niedermayer. Signed-off-by: Martin Storsjö <martin@martin.st>
* | xtea: fix decryption with --enable-smallGiorgio Vazzana2012-09-30
| | | | | | | | | | | | iv decrypt handling code needs to be executed regardless of CONFIG_SMALL Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | xtea: move iv decrypt handling code into xtea_crypt_ecb()Michael Niedermayer2012-09-30
| | | | | | | | | | | | this simplifies things are avoids a temporary Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | xtea-test: test inplace decryptionMichael Niedermayer2012-09-30
| | | | | | | | | | Based on test code by: Giorgio Vazzana <mywing81@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | xtea: fix CBC mode when src=dstGiorgio Vazzana2012-09-30
| | | | | | | | | | | | | | | | | | In CBC mode, when src=dst and we are decrypting a block different from the first one, we need to save the current block of ciphertext (which will constitute the initialization vector for the next block) before we overwrite it. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | xtea-test: factorize test codeMichael Niedermayer2012-09-30
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | xtea: optimize core, about 4-5% faster.Michael Niedermayer2012-09-11
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-07-05
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: qdm2: remove broken and disabled dump_context() debug function x86: h264_intrapred: use newly introduced SPLAT* and PSHUFLW macros x86inc: add SPLATB_LOAD, SPLATB_REG, PSHUFLW macros x86inc: modify ALIGN to not generate long nops on i586 x86: h264_intrapred: port to cpuflag macros avplay: update input filter pointer when the filtergraph is reset. avconv: fix parsing of -force_key_frames option. h264: use templates to avoid excessive inlining xtea: Make the count parameter match the documentation blowfish: Make the count parameter match the documentation mpegvideo: Don't use ff_mspel_motion() for vc1 xtea: invert branch and loop precedence blowfish: invert branch and loop precedence flvdec: optionally trust the metadata avconv: Set audio filter time base to the sample rate vp8: Add ifdef guards around the sse2 loopfilter in the sse2slow branch too Conflicts: ffmpeg.c ffplay.c libavcodec/h264.c libavcodec/mpegvideo_common.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * xtea: Make the count parameter match the documentationSamuel Pitoiset2012-07-05
| | | | | | | | | | | | | | | | Previously it was interpreted as number of bytes, while the documentation stated that it was the number of 8 byte blocks. This makes it behave similarly to the existing AES code. Signed-off-by: Martin Storsjö <martin@martin.st>
| * xtea: invert branch and loop precedenceLuca Barbato2012-07-05
| | | | | | | | Should slightly improve performance depending on the compiler used.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-07-04
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (29 commits) lavfi: reclassify showfiltfmts as a TESTPROG graph2dot: fix printf format specifier swscale: yuv2planeX 8bit >=sse2 functions need aligned stack on x86-32. vp8: loopfilter >=sse2 functions need aligned stack on x86-32. amr: remove shift out of the AMR_BIT() macro. dsputilenc: group yasm and inline asm function pointer assignment. mov: use forward declaration of a function instead of a table. Clarify Doxygen comment for FF_API_* #defines. configure: simplify get_version() Create version.h headers for libraries that lack them gitignore: Use full path instead of relative path to specify patterns mpegvideo: remove VLAs Add XTEA encryption support in libavutil Add Blowfish encryption support in libavutil eval: Add the isinf() function and tests for it flacdec: move lpc filter to flacdsp flacdec: split off channel decorrelation as flacdsp avplay: Add an option for not limiting the input buffer size FATE: add a test for WMA cover art. FATE: add a test for apetag cover art ... Conflicts: .gitignore configure ffplay.c libavcodec/Makefile libavcodec/error_resilience.c libavcodec/mpegvideo.c libavcodec/ratecontrol.c libavdevice/avdevice.h libavfilter/Makefile libavfilter/filtfmts.c libavfilter/version.h libavformat/mov.c libavformat/version.h libavutil/Makefile libavutil/avutil.h libavutil/version.h libswscale/swscale.h libswscale/x86/swscale_mmx.c tests/fate/libavutil.mak tests/lavfi-regression.sh tools/graph2dot.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* Add XTEA encryption support in libavutilSamuel Pitoiset2012-07-04
Signed-off-by: Martin Storsjö <martin@martin.st>
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-12 22:44:09 +0000