From ac3353b0e7707101ae72e4ca1272a3d19e38f75f Mon Sep 17 00:00:00 2001 From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= Date: Thu, 2 Jun 2005 12:30:30 +0000 Subject: [PATCH] Digest => DigestMD5 --- include/vlc_md5.h | 2 +- modules/demux/mp4/drms.c | 4 +++- src/misc/md5.c | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/include/vlc_md5.h b/include/vlc_md5.h index c4a79ca6dd..0ad71a8e57 100644 --- a/include/vlc_md5.h +++ b/include/vlc_md5.h @@ -41,6 +41,6 @@ struct md5_s VLC_EXPORT(void, InitMD5, ( struct md5_s * ) ); VLC_EXPORT(void, AddMD5, ( struct md5_s *, const uint8_t *, uint32_t ) ); VLC_EXPORT(void, EndMD5, ( struct md5_s * ) ); -VLC_EXPORT(void, Digest, ( struct md5_s *, uint32_t * ) ); +VLC_EXPORT(void, DigestMD5, ( struct md5_s *, uint32_t * ) ); #endif diff --git a/modules/demux/mp4/drms.c b/modules/demux/mp4/drms.c index 00274c7283..711eb3d337 100644 --- a/modules/demux/mp4/drms.c +++ b/modules/demux/mp4/drms.c @@ -89,7 +89,9 @@ struct aes_s uint32_t pp_dec_keys[ AES_KEY_COUNT + 1 ][ 4 ]; }; -#ifndef __VLC__ +#ifdef __VLC__ +# define Digest DigestMD5 +#else /***************************************************************************** * md5_s: MD5 message structure ***************************************************************************** diff --git a/src/misc/md5.c b/src/misc/md5.c index 4672deae85..2963c9aa96 100644 --- a/src/misc/md5.c +++ b/src/misc/md5.c @@ -53,9 +53,9 @@ static inline void Reverse( uint32_t *p_buffer, int n ) ( w += f(x, y, z) + data, w = w<>(32-s), w += x ) /***************************************************************************** - * Digest: update the MD5 digest with 64 bytes of data + * DigestMD5: update the MD5 digest with 64 bytes of data *****************************************************************************/ -void Digest( struct md5_s *p_md5, uint32_t *p_input ) +void DigestMD5( struct md5_s *p_md5, uint32_t *p_input ) { uint32_t a, b, c, d; -- 2.39.2