[vlc-devel] [PATCH v2 14/15] src: remove old md5 API
Marvin Scholz
epirat07 at gmail.com
Wed Apr 8 00:04:30 CEST 2020
---
include/vlc_common.h | 2 +-
include/vlc_hash.h | 9 ++++---
include/vlc_md5.h | 59 --------------------------------------------
po/POTFILES.in | 1 -
src/Makefile.am | 1 -
src/libvlccore.sym | 3 ---
src/misc/md5.c | 17 +------------
7 files changed, 8 insertions(+), 84 deletions(-)
delete mode 100644 include/vlc_md5.h
diff --git a/include/vlc_common.h b/include/vlc_common.h
index 222ce81bc4..22a6c089d7 100644
--- a/include/vlc_common.h
+++ b/include/vlc_common.h
@@ -427,7 +427,7 @@ typedef struct block_t block_t;
typedef struct block_fifo_t block_fifo_t;
/* Hashing */
-typedef struct md5_s md5_t;
+typedef struct vlc_hash_md5_ctx vlc_hash_md5_t;
/* XML */
typedef struct xml_t xml_t;
diff --git a/include/vlc_hash.h b/include/vlc_hash.h
index 19d137c9cc..b07cf755fa 100644
--- a/include/vlc_hash.h
+++ b/include/vlc_hash.h
@@ -25,8 +25,6 @@
#ifndef VLC_HASH_H
# define VLC_HASH_H
-#include <vlc_md5.h>
-
/**
* \defgroup vlc_hash Hash functions
* APIs for simple and frequently used hash algorithms in VLC
@@ -52,7 +50,12 @@
*/
typedef struct vlc_hash_md5_ctx
{
- struct md5_s priv; /**< \internal Private */
+ struct md5_s {
+ uint32_t A, B, C, D; /* chaining variables */
+ uint32_t nblocks;
+ uint8_t buf[64];
+ int count;
+ } priv; /**< \internal Private */
} vlc_hash_md5_t;
/**
diff --git a/include/vlc_md5.h b/include/vlc_md5.h
deleted file mode 100644
index e72ff2f684..0000000000
--- a/include/vlc_md5.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/*****************************************************************************
- * vlc_md5.h: MD5 hash
- *****************************************************************************
- * Copyright © 2004-2011 VLC authors and VideoLAN
- *
- * 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 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 Lesser General Public License for more details.
- *
- * 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
-
-/**
- * \file
- * This file defines functions and structures to compute MD5 digests
- */
-
-struct md5_s
-{
- uint32_t A, B, C, D; /* chaining variables */
- uint32_t nblocks;
- uint8_t buf[64];
- int count;
-};
-
-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
- * md5sum tools.
- */
-static inline char * psz_md5_hash( struct md5_s *md5_s )
-{
- char *psz = (char*)malloc( 33 ); /* md5 string is 32 bytes + NULL character */
- if( likely(psz) )
- {
- for( int i = 0; i < 16; i++ )
- sprintf( &psz[2*i], "%02" PRIx8, md5_s->buf[i] );
- }
- return psz;
-}
-
-#endif
diff --git a/po/POTFILES.in b/po/POTFILES.in
index ce1709182d..b2c70e6524 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -27,7 +27,6 @@ include/vlc_image.h
include/vlc_input.h
include/vlc_intf_strings.h
include/vlc_iso_lang.h
-include/vlc_md5.h
include/vlc_messages.h
include/vlc_meta.h
include/vlc_modules.h
diff --git a/src/Makefile.am b/src/Makefile.am
index 7e99d03bc2..7b5582ce6d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -64,7 +64,6 @@ pluginsinclude_HEADERS = \
../include/vlc_interface.h \
../include/vlc_keystore.h \
../include/vlc_list.h \
- ../include/vlc_md5.h \
../include/vlc_media_source.h \
../include/vlc_messages.h \
../include/vlc_meta.h \
diff --git a/src/libvlccore.sym b/src/libvlccore.sym
index ed07d998e2..bb5791edef 100644
--- a/src/libvlccore.sym
+++ b/src/libvlccore.sym
@@ -1,6 +1,5 @@
access_vaDirectoryControlHelper
vlc_access_NewMRL
-AddMD5
aout_BitsPerSample
aout_ChannelExtract
aout_ChannelReorder
@@ -96,7 +95,6 @@ vlc_demux_chained_New
vlc_demux_chained_Send
vlc_demux_chained_ControlVa
vlc_demux_chained_Delete
-EndMD5
es_format_Clean
es_format_Copy
es_format_Init
@@ -167,7 +165,6 @@ image_HandlerCreate
image_HandlerDelete
image_Mime2Fourcc
image_Type2Fourcc
-InitMD5
vlc_input_decoder_Create
vlc_input_decoder_Delete
vlc_input_decoder_Decode
diff --git a/src/misc/md5.c b/src/misc/md5.c
index 24b940debf..d87e7b9e9f 100644
--- a/src/misc/md5.c
+++ b/src/misc/md5.c
@@ -335,22 +335,7 @@ md5_read( void *context )
}
#endif
-void InitMD5( struct md5_s *h )
-{
- md5_init( h );
-}
-
-void AddMD5( struct md5_s *restrict h, const void *data, size_t len )
-{
- md5_write( h, data, len );
-}
-
-void EndMD5( struct md5_s *h )
-{
- md5_final( h );
-}
-
-/* New API */
+/* Public API */
void vlc_hash_md5_Init(vlc_hash_md5_t *ctx)
{
md5_init(&ctx->priv);
--
2.24.1 (Apple Git-126)
More information about the vlc-devel
mailing list