Revert "demux: ts: fix mpeg4desc leak"

[vlc] / include / vlc_md5.h

diff --git a/include/vlc_md5.h b/include/vlc_md5.h
index 46f10f01439edbcc8bad45673cc302039b76dd5b..0d61b394a16f6b241b9139e6f19832fec8f354f4 100644 (file)
--- a/include/vlc_md5.h
+++ b/include/vlc_md5.h
@@ -1,46 +1,45 @@
 /*****************************************************************************
  * vlc_md5.h: MD5 hash
  *****************************************************************************
- * Copyright (C) 2004-2005 the VideoLAN team
- * $Id$
+ * Copyright © 2004-2011 VLC authors and VideoLAN
  *
- * Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
- *          Sam Hocevar <sam@zoy.org>
+ * Authors: Rémi Denis-Courmont
+ *          Rafaël Carré
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#ifndef _VLC_MD5_H
-# define _VLC_MD5_H
+#ifndef VLC_MD5_H
+# define VLC_MD5_H
+
+/**
+ * \file
+ * This file defines functions and structures to compute MD5 digests
+ */
 
-/*****************************************************************************
- * md5_s: MD5 message structure
- *****************************************************************************
- * This structure stores the static information needed to compute an MD5
- * hash. It has an extra data buffer to allow non-aligned writes.
- *****************************************************************************/
 struct md5_s
 {
-    uint64_t i_bits;      /* Total written bits */
-    uint32_t p_digest[4]; /* The MD5 digest */
-    uint32_t p_data[16];  /* Buffer to cache non-aligned writes */
+    uint32_t A, B, C, D;          /* chaining variables */
+    uint32_t nblocks;
+    uint8_t buf[64];
+    int count;
 };
 
-VLC_EXPORT(void, InitMD5, ( struct md5_s * ) );
-VLC_EXPORT(void, AddMD5, ( struct md5_s *, const void *, size_t ) );
-VLC_EXPORT(void, EndMD5, ( struct md5_s * ) );
+VLC_API void InitMD5( struct md5_s * );
+VLC_API void AddMD5( struct md5_s *, const void *, size_t );
+VLC_API void EndMD5( struct md5_s * );
 
 /**
  * Returns a char representation of the md5 hash, as shown by UNIX md5 or
@@ -49,20 +48,11 @@ VLC_EXPORT(void, EndMD5, ( struct md5_s * ) );
 static inline char * psz_md5_hash( struct md5_s *md5_s )
 {
     char *psz = malloc( 33 ); /* md5 string is 32 bytes + NULL character */
-    if( !psz ) return NULL;
-
-    int i;
-    for ( i = 0; i < 4; i++ )
+    if( likely(psz) )
     {
-        sprintf( &psz[8*i], "%02x%02x%02x%02x",
-            md5_s->p_digest[i] & 0xff,
-            ( md5_s->p_digest[i] >> 8 ) & 0xff,
-            ( md5_s->p_digest[i] >> 16 ) & 0xff,
-            md5_s->p_digest[i] >> 24
-        );
+        for( int i = 0; i < 16; i++ )
+            sprintf( &psz[2*i], "%02"PRIx8, md5_s->buf[i] );
     }
-    psz[32] = '\0';
-
     return psz;
 }