From: Rémi Denis-Courmont <remi@remlab.net>
Date: Fri, 25 Nov 2011 21:22:46 +0000 (+0200)
Subject: lua: remove MD5 functions before someone uses them
X-Git-Tag: 1.3.0-git~58
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=b3efd4273794e51e2856f7a81073ab60ab545c84;p=vlc

lua: remove MD5 functions before someone uses them
---

diff --git a/modules/lua/Modules.am b/modules/lua/Modules.am
index a80680401b..4616971e6a 100644
--- a/modules/lua/Modules.am
+++ b/modules/lua/Modules.am
@@ -17,7 +17,6 @@ SOURCES_lua = \
 	libs/httpd.c \
 	libs/input.c \
 	libs/input.h \
-	libs/md5.c \
 	libs/messages.c \
 	libs/misc.c \
 	libs/misc.h \
diff --git a/modules/lua/demux.c b/modules/lua/demux.c
index b55015adb8..169d668a80 100644
--- a/modules/lua/demux.c
+++ b/modules/lua/demux.c
@@ -153,7 +153,6 @@ static int probe_luascript( vlc_object_t *p_this, const char * psz_filename,
     luaopen_stream( L );
     luaopen_variables( L );
     luaopen_xml( L );
-    luaopen_md5( L );
     lua_pushstring( L, p_demux->psz_location );
     lua_setfield( L, -2, "path" );
     lua_pushstring( L, p_demux->psz_access );
diff --git a/modules/lua/extension.c b/modules/lua/extension.c
index 6f3fe3a4fa..49fc5112e3 100644
--- a/modules/lua/extension.c
+++ b/modules/lua/extension.c
@@ -826,7 +826,6 @@ static lua_State* GetLuaState( extensions_manager_t *p_mgr,
             luaopen_config( L );
             luaopen_dialog( L, p_ext );
             luaopen_input( L );
-            luaopen_md5( L );
             luaopen_msg( L );
             luaopen_net( L );
             luaopen_object( L );
diff --git a/modules/lua/intf.c b/modules/lua/intf.c
index 22b974a6bc..d1d1d140db 100644
--- a/modules/lua/intf.c
+++ b/modules/lua/intf.c
@@ -178,7 +178,6 @@ static int Start_LuaIntf( vlc_object_t *p_this, const char *name )
     luaopen_volume( L );
     luaopen_gettext( L );
     luaopen_xml( L );
-    luaopen_md5( L );
     luaopen_equalizer( L );
 
     /* clean up */
diff --git a/modules/lua/libs.h b/modules/lua/libs.h
index 9afaac02fe..d67a672caa 100644
--- a/modules/lua/libs.h
+++ b/modules/lua/libs.h
@@ -45,7 +45,6 @@ void luaopen_volume( lua_State * );
 void luaopen_gettext( lua_State * );
 void luaopen_input_item( lua_State *L, input_item_t *item );
 void luaopen_xml( lua_State *L );
-void luaopen_md5( lua_State *L );
 void luaopen_equalizer( lua_State *L );
 
 #endif
diff --git a/modules/lua/libs/md5.c b/modules/lua/libs/md5.c
deleted file mode 100644
index 1531a20e8e..0000000000
--- a/modules/lua/libs/md5.c
+++ /dev/null
@@ -1,126 +0,0 @@
-/*****************************************************************************
- * md5.c: md5 hashing functions
- *****************************************************************************
- * Copyright (C) 2010 Antoine Cellerier
- * $Id$
- *
- * Authors: Antoine Cellerier <dionoea at videolan tod org>
- *
- * 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
- * (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.
- *
- * 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.
- *****************************************************************************/
-
-/*****************************************************************************
- * Preamble
- *****************************************************************************/
-#ifndef  _GNU_SOURCE
-#   define  _GNU_SOURCE
-#endif
-
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <vlc_common.h>
-#include <vlc_md5.h>
-
-#include <lua.h>        /* Low level lua C API */
-#include <lauxlib.h>    /* Higher level C API */
-
-#include "../vlc.h"
-#include "../libs.h"
-
-/*****************************************************************************
- *
- *****************************************************************************/
-static int vlclua_md5_create( lua_State * );
-static int vlclua_md5_add( lua_State * );
-static int vlclua_md5_end( lua_State * );
-static int vlclua_md5_hash( lua_State * );
-
-static const luaL_Reg vlclua_md5_reg[] = {
-    { "add", vlclua_md5_add },
-    { "end", vlclua_md5_end },
-    { "end_", vlclua_md5_end },
-    { "hash", vlclua_md5_hash },
-    { NULL, NULL }
-};
-
-static int vlclua_md5_create( lua_State *L )
-{
-    if( lua_gettop( L ) )
-    {
-        /* If optional first argument is given, and it's a string, just
-         * return the string's hash */
-        const char *psz_str = luaL_checkstring( L, 1 );
-        struct md5_s md5;
-        InitMD5( &md5 );
-        AddMD5( &md5, psz_str, strlen( psz_str ) );
-        EndMD5( &md5 );
-        char *psz_hash = psz_md5_hash( &md5 );
-        lua_pushstring( L, psz_hash );
-        free( psz_hash );
-        return 1;
-    }
-
-    struct md5_s *p_md5 = lua_newuserdata( L, sizeof( struct md5_s ) );
-    InitMD5( p_md5 );
-
-    if( luaL_newmetatable( L, "md5" ) )
-    {
-        lua_newtable( L );
-        luaL_register( L, NULL, vlclua_md5_reg );
-        lua_setfield( L, -2, "__index" );
-    }
-
-    lua_setmetatable( L, -2 );
-    return 1;
-}
-
-static int vlclua_md5_add( lua_State *L )
-{
-    struct md5_s *p_md5 = (struct md5_s *)luaL_checkudata( L, 1, "md5" );
-    if( !lua_isstring( L, 2 ) )
-        luaL_error( L, "2nd argument should be a string" );
-    size_t i_len = 0;
-    const char *psz_str = lua_tolstring( L, 2, &i_len );
-    if( !psz_str )
-        vlclua_error( L );
-
-    AddMD5( p_md5, psz_str, i_len );
-
-    return 0;
-}
-
-static int vlclua_md5_end( lua_State *L )
-{
-    struct md5_s *p_md5 = (struct md5_s *)luaL_checkudata( L, 1, "md5" );
-    EndMD5( p_md5 );
-    return 0;
-}
-
-static int vlclua_md5_hash( lua_State *L )
-{
-    struct md5_s *p_md5 = (struct md5_s *)luaL_checkudata( L, 1, "md5" );
-    char *psz_hash = psz_md5_hash( p_md5 );
-    lua_pushstring( L, psz_hash );
-    free( psz_hash );
-    return 1;
-}
-
-void luaopen_md5( lua_State *L )
-{
-    lua_pushcfunction( L, vlclua_md5_create );
-    lua_setfield( L, -2, "md5" );
-}
diff --git a/modules/lua/meta.c b/modules/lua/meta.c
index 21706cfdb0..eda16bcb7b 100644
--- a/modules/lua/meta.c
+++ b/modules/lua/meta.c
@@ -72,7 +72,6 @@ static lua_State * init( vlc_object_t *p_this, input_item_t * p_item, const char
     luaopen_variables( L );
     luaopen_object( L );
     luaopen_xml( L );
-    luaopen_md5( L );
     luaopen_input_item( L, p_item );
 
     if( vlclua_add_modules_path( p_this, L, psz_filename ) )
diff --git a/modules/lua/services_discovery.c b/modules/lua/services_discovery.c
index 8ae108d25c..f9425e092c 100644
--- a/modules/lua/services_discovery.c
+++ b/modules/lua/services_discovery.c
@@ -118,7 +118,6 @@ int Open_LuaSD( vlc_object_t *p_this )
     luaopen_stream( L );
     luaopen_gettext( L );
     luaopen_xml( L );
-    luaopen_md5( L );
     lua_pop( L, 1 );
 
     if( vlclua_add_modules_path( p_sd, L, p_sys->psz_filename ) )
diff --git a/share/lua/README.txt b/share/lua/README.txt
index 76a1469d29..aae5ed0e71 100644
--- a/share/lua/README.txt
+++ b/share/lua/README.txt
@@ -133,14 +133,6 @@ input.item(): Get the current input item. Input item methods are:
     .played_abuffers
     .lost_abuffers
 
-MD5
----
-md5( str ): return the string's hash
-md5(): create an md5 object with the following methods:
-  :add( str ): add a string to the hash
-  :end_(): finish hashing
-  :hash(): return the hash
-
 Messages
 --------
 msg.dbg( [str1, [str2, [...]]] ): Output debug messages (-vv).