vlc | branch: master | Thomas Guillem <[email protected]> | Thu Feb 25 12:58:15 2016 +0100| [3078d5ded738f36dbc9fb244dddb1de76e1db9aa] | committer: Thomas Guillem
keystore/plaintext: rename to memory No functional changes. > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=3078d5ded738f36dbc9fb244dddb1de76e1db9aa --- NEWS | 2 +- modules/MODULES_LIST | 2 +- modules/keystore/Makefile.am | 4 ++-- modules/keystore/{plaintext.c => memory.c} | 10 +++++----- test/modules/keystore/test.c | 6 +++--- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/NEWS b/NEWS index 4bed4c6..ccaccbe 100644 --- a/NEWS +++ b/NEWS @@ -201,7 +201,7 @@ Misc * Add a text-to-speech renderer for subtitles on Windows * Add Gnome libsecret-based crypto keystore * Add KDE Kwallet-based crypto keystore - * Add a plaintext keystore + * Add a memory keystore * Add Keychain based crypto keystore for iOS, Mac OS X and tvOS Removed modules diff --git a/modules/MODULES_LIST b/modules/MODULES_LIST index 55822e1..04dd417 100644 --- a/modules/MODULES_LIST +++ b/modules/MODULES_LIST @@ -224,6 +224,7 @@ $Id$ * marq: Overlays a marquee on the video * mediacodec: Android Jelly Bean MediaCodec decoder module * mediadirs: Picture/Music/Video user directories as service discoveries + * memory: store secrets in memory * mft: Media Foundation Transform audio/video decoder * microdns: mDNS services discovery * minimal_macosx: a minimal Mac OS X GUI, using the FrameWork @@ -290,7 +291,6 @@ $Id$ * packetizer_vc1: VC-1 video packetizer * panoramix: image wall panoramic video with edge blending filter * param_eq: parametric equalizer - * plaintext_keystore: store secrets in a plaintext file (insecure) * playlist: playlist import module * png: PNG images decoder * podcast: podcast feed parser diff --git a/modules/keystore/Makefile.am b/modules/keystore/Makefile.am index c4aaead..58e1a5e 100644 --- a/modules/keystore/Makefile.am +++ b/modules/keystore/Makefile.am @@ -1,7 +1,7 @@ keystoredir = $(pluginsdir)/keystore -libplaintext_keystore_plugin_la_SOURCES = keystore/plaintext.c -keystore_LTLIBRARIES = libplaintext_keystore_plugin.la +libmemory_keystore_plugin_la_SOURCES = keystore/memory.c +keystore_LTLIBRARIES = libmemory_keystore_plugin.la libsecret_plugin_la_SOURCES = keystore/secret.c libsecret_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) $(SECRET_CFLAGS) diff --git a/modules/keystore/plaintext.c b/modules/keystore/memory.c similarity index 97% rename from modules/keystore/plaintext.c rename to modules/keystore/memory.c index b8ea30e..5263101 100644 --- a/modules/keystore/plaintext.c +++ b/modules/keystore/memory.c @@ -1,5 +1,5 @@ /***************************************************************************** - * plaintext.c: Insecure keystore + * memory.c: Memory keystore ***************************************************************************** * Copyright © 2015-2016 VLC authors, VideoLAN and VideoLabs * @@ -41,11 +41,11 @@ static int Open(vlc_object_t *); static void Close(vlc_object_t *); vlc_module_begin() - set_shortname(N_("plaintext keystore (insecure)")) - set_description(N_("secrets are stored in plaintext without any encryption")) + set_shortname(N_("memory keystore (insecure)")) + set_description(N_("secrets are stored in memory without any encryption")) set_category(CAT_ADVANCED) set_subcategory(SUBCAT_ADVANCED_MISC) - add_string("keystore-plaintext-file", NULL, NULL, NULL, false ) + add_string("keystore-file", NULL, NULL, NULL, true) set_capability("keystore", 0) set_callbacks(Open, Close) vlc_module_end () @@ -481,7 +481,7 @@ Open(vlc_object_t *p_this) /* The p_sys context is shared and protected between all threads */ if (instance.i_ref_count == 0) { - char *psz_file = var_InheritString(p_this, "keystore-plaintext-file"); + char *psz_file = var_InheritString(p_this, "keystore-file"); if (!psz_file) return VLC_EGENERIC; diff --git a/test/modules/keystore/test.c b/test/modules/keystore/test.c index caa6fa2..b4ef656 100644 --- a/test/modules/keystore/test.c +++ b/test/modules/keystore/test.c @@ -47,7 +47,7 @@ static const struct bool b_test_default; } keystore_args[] = { - { "plaintext", true }, + { "memory", true }, /* Following keystores are tested only when asked explicitly by the tester * (with "-a" argv) */ { "secret", false }, @@ -296,12 +296,12 @@ main(int i_argc, char *ppsz_argv[]) assert(asprintf(&ppsz_vlc_argv[0], "--keystore=%s,none", psz_module) != -1); - if (strcmp(psz_module, "plaintext") == 0) + if (strcmp(psz_module, "memory") == 0) { assert((i_tmp_fd = mkstemp(psz_tmp_path)) != -1); printf("plaintext tmp file: '%s'\n", psz_tmp_path); assert(asprintf(&ppsz_vlc_argv[1], - "--keystore-plaintext-file=%s", psz_tmp_path) != -1); + "--keystore-file=%s", psz_tmp_path) != -1); i_vlc_argc++; } else if (strcmp(psz_module, "kwallet") == 0) _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
