← Back to branch summary

~ubuntu-branches/ubuntu/vivid/libav/vivid

« back to all changes in this revision

Viewing changes to libavutil/des.c

  • Committer: Package Import Robot
  • Author(s): Reinhard Tartler
  • Date: 2013-10-22 23:24:08 UTC
  • mfrom: (1.3.36 sid)
  • Revision ID: package-import@ubuntu.com-20131022232408-b8tvvn4pyzri9mi3
Tags: 6:9.10-1ubuntu1
https://launchpad.net/bugs/1243235
https://launchpad.net/bugs/1180288
https://launchpad.net/bugs/1242802
* Build all -extra flavors from this source package, as libav got demoted
  from main to universe, cf LP: #1243235
* Simplify debian/rules to follow exactly the code that debian executes
* New upstream (LP: #1180288) fixes lots of security issues (LP: #1242802)
* Merge from unstable, remaining changes:
  - build-depend on libtiff5-dev rather than libtiff4-dev,
    avoids FTBFS caused by imlib
  - follow the regular debian codepaths

Show diffs side-by-side

added added

removed removed

Lines of Context:
libavutil/des.c
337
337
}
338
338
 
339
339
#ifdef TEST
340
 
#undef printf
341
 
#undef rand
342
 
#undef srand
343
340
#include <stdlib.h>
344
341
#include <stdio.h>
345
 
#include <sys/time.h>
 
342
#include "libavutil/time.h"
346
343
static uint64_t rand64(void) {
347
344
    uint64_t r = rand();
348
345
    r = (r << 32) | rand();
389
386
#ifdef GENTABLES
390
387
    int j;
391
388
#endif
392
 
    struct timeval tv;
393
389
    uint64_t key[3];
394
390
    uint64_t data;
395
391
    uint64_t ct;
396
392
    uint64_t roundkeys[16];
397
 
    gettimeofday(&tv, NULL);
398
 
    srand(tv.tv_sec * 1000 * 1000 + tv.tv_usec);
 
393
    srand(av_gettime());
399
394
    key[0] = AV_RB64(test_key);
400
395
    data = AV_RB64(plain);
401
396
    gen_roundkeys(roundkeys, key[0]);