RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-22 23:33:07 +00:00
Code Issues Projects Releases Wiki Activity

Remove/replace code disabled by major version bump.

Browse Source 
Originally committed as revision 17875 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Reimar Döffinger 2009-03-08 14:51:25 +00:00
parent 52a6632a2b
commit 3fb1084306
1 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libavutil/des.c
View File

@ -284,14 +284,6 @@ static uint64_t des_encdec(uint64_t in, uint64_t K[16], int decrypt) {
return in; return in;
} }
#if LIBAVUTIL_VERSION_MAJOR < 50
uint64_t ff_des_encdec(uint64_t in, uint64_t key, int decrypt) {
uint64_t K[16];
gen_roundkeys(K, key);
return des_encdec(in, K, decrypt);
}
#endif
int av_des_init(AVDES *d, const uint8_t *key, int key_bits, int decrypt) { int av_des_init(AVDES *d, const uint8_t *key, int key_bits, int decrypt) {
if (key_bits != 64 && key_bits != 192) if (key_bits != 64 && key_bits != 192)
return -1; return -1;
@ -390,16 +382,16 @@ int main(void) {
uint64_t key[3]; uint64_t key[3];
uint64_t data; uint64_t data;
uint64_t ct; uint64_t ct;
uint64_t roundkeys[16];
gettimeofday(&tv, NULL); gettimeofday(&tv, NULL);
srand(tv.tv_sec * 1000 * 1000 + tv.tv_usec); srand(tv.tv_sec * 1000 * 1000 + tv.tv_usec);
#if LIBAVUTIL_VERSION_MAJOR < 50
key[0] = AV_RB64(test_key); key[0] = AV_RB64(test_key);
data = AV_RB64(plain); data = AV_RB64(plain);
if (ff_des_encdec(data, key[0], 0) != AV_RB64(crypt)) { gen_roundkeys(roundkeys, key[0]);
if (des_encdec(data, roundkeys, 0) != AV_RB64(crypt)) {
printf("Test 1 failed\n"); printf("Test 1 failed\n");
return 1; return 1;
} }
#endif
av_des_init(&d, test_key, 64, 0); av_des_init(&d, test_key, 64, 0);
av_des_crypt(&d, tmp, plain, 1, NULL, 0); av_des_crypt(&d, tmp, plain, 1, NULL, 0);
if (memcmp(tmp, crypt, sizeof(crypt))) { if (memcmp(tmp, crypt, sizeof(crypt))) {