diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-09-21 21:25:43 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-09-21 21:25:43 +0200 |
| commit | 3e1a7ae44a97f20bbc9da0eba000663ef74e1890 (patch) | |
| tree | 75bfd6ad30f1b24aa7d29c3a3081875c14b5dab5 /libavutil/des.h | |
| parent | 358d837dad4e2fbe010553990383d0ca4d5937cf (diff) | |
| parent | 05fc9e40a4e4f808d457512420b887f458d216bc (diff) | |
| download | ffmpeg-3e1a7ae44a97f20bbc9da0eba000663ef74e1890.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
swfdec: Add support for sample_rate_code 0 (5512 Hz)
dct-test: factor out some common code and do whas was likely intended
doc: library versions need to be bumped in version.h
Revert "ffmpeg: get rid of useless AVInputStream.nb_streams."
Remove some forgotten AVCodecContext.palctrl usage.
lavc/utils: move avcodec_init() higher in the file.
lavc: replace some deprecated FF_*_TYPE with AV_PICTURE_TYPE_*
ac3dec: actually use drc_scale private option
lavc: undeprecate AVPALETTE_SIZE and AVPALETTE_COUNT macros
alsa: add missing header
msmpeg4: remove leftover unused debug variable declaration
Fix assert() calls that need updates after FF_COMMON_FRAME macro elimination.
Fix av_dlog invocations with wrong or missing logging context.
vf_yadif: add support to yuva420p
vf_yadif: correct documentation on the parity parameter
vf_yadif: copy buffer properties like aspect for second frame as well
oma: support for encrypted files
id3v2: add support for non-text and GEOB type tag frames
des: add possibility to calculate DES-CBC-MAC with small buffer
Conflicts:
ffmpeg.c
libavcodec/dct-test.c
libavformat/mpegts.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/des.h')
| -rw-r--r-- | libavutil/des.h | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/libavutil/des.h b/libavutil/des.h index dd670869b2..2feb0468db 100644 --- a/libavutil/des.h +++ b/libavutil/des.h @@ -33,7 +33,7 @@ struct AVDES { * @brief Initializes an AVDES context. * * @param key_bits must be 64 or 192 - * @param decrypt 0 for encryption, 1 for decryption + * @param decrypt 0 for encryption/CBC-MAC, 1 for decryption */ int av_des_init(struct AVDES *d, const uint8_t *key, int key_bits, int decrypt); @@ -49,4 +49,13 @@ int av_des_init(struct AVDES *d, const uint8_t *key, int key_bits, int decrypt); */ void av_des_crypt(struct AVDES *d, uint8_t *dst, const uint8_t *src, int count, uint8_t *iv, int decrypt); +/** + * @brief Calculates CBC-MAC using the DES algorithm. + * + * @param count number of 8 byte blocks + * @param dst destination array, can be equal to src, must be 8-byte aligned + * @param src source array, can be equal to dst, must be 8-byte aligned, may be NULL + */ +void av_des_mac(struct AVDES *d, uint8_t *dst, const uint8_t *src, int count); + #endif /* AVUTIL_DES_H */ |