Commit 3078d5de authored by Thomas Guillem's avatar Thomas Guillem

keystore/plaintext: rename to memory

No functional changes.
parent 38452bb3
...@@ -201,7 +201,7 @@ Misc ...@@ -201,7 +201,7 @@ Misc
* Add a text-to-speech renderer for subtitles on Windows * Add a text-to-speech renderer for subtitles on Windows
* Add Gnome libsecret-based crypto keystore * Add Gnome libsecret-based crypto keystore
* Add KDE Kwallet-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 * Add Keychain based crypto keystore for iOS, Mac OS X and tvOS
Removed modules Removed modules
......
...@@ -224,6 +224,7 @@ $Id$ ...@@ -224,6 +224,7 @@ $Id$
* marq: Overlays a marquee on the video * marq: Overlays a marquee on the video
* mediacodec: Android Jelly Bean MediaCodec decoder module * mediacodec: Android Jelly Bean MediaCodec decoder module
* mediadirs: Picture/Music/Video user directories as service discoveries * mediadirs: Picture/Music/Video user directories as service discoveries
* memory: store secrets in memory
* mft: Media Foundation Transform audio/video decoder * mft: Media Foundation Transform audio/video decoder
* microdns: mDNS services discovery * microdns: mDNS services discovery
* minimal_macosx: a minimal Mac OS X GUI, using the FrameWork * minimal_macosx: a minimal Mac OS X GUI, using the FrameWork
...@@ -290,7 +291,6 @@ $Id$ ...@@ -290,7 +291,6 @@ $Id$
* packetizer_vc1: VC-1 video packetizer * packetizer_vc1: VC-1 video packetizer
* panoramix: image wall panoramic video with edge blending filter * panoramix: image wall panoramic video with edge blending filter
* param_eq: parametric equalizer * param_eq: parametric equalizer
* plaintext_keystore: store secrets in a plaintext file (insecure)
* playlist: playlist import module * playlist: playlist import module
* png: PNG images decoder * png: PNG images decoder
* podcast: podcast feed parser * podcast: podcast feed parser
......
keystoredir = $(pluginsdir)/keystore keystoredir = $(pluginsdir)/keystore
libplaintext_keystore_plugin_la_SOURCES = keystore/plaintext.c libmemory_keystore_plugin_la_SOURCES = keystore/memory.c
keystore_LTLIBRARIES = libplaintext_keystore_plugin.la keystore_LTLIBRARIES = libmemory_keystore_plugin.la
libsecret_plugin_la_SOURCES = keystore/secret.c libsecret_plugin_la_SOURCES = keystore/secret.c
libsecret_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) $(SECRET_CFLAGS) libsecret_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) $(SECRET_CFLAGS)
......
/***************************************************************************** /*****************************************************************************
* plaintext.c: Insecure keystore * memory.c: Memory keystore
***************************************************************************** *****************************************************************************
* Copyright © 2015-2016 VLC authors, VideoLAN and VideoLabs * Copyright © 2015-2016 VLC authors, VideoLAN and VideoLabs
* *
...@@ -41,11 +41,11 @@ static int Open(vlc_object_t *); ...@@ -41,11 +41,11 @@ static int Open(vlc_object_t *);
static void Close(vlc_object_t *); static void Close(vlc_object_t *);
vlc_module_begin() vlc_module_begin()
set_shortname(N_("plaintext keystore (insecure)")) set_shortname(N_("memory keystore (insecure)"))
set_description(N_("secrets are stored in plaintext without any encryption")) set_description(N_("secrets are stored in memory without any encryption"))
set_category(CAT_ADVANCED) set_category(CAT_ADVANCED)
set_subcategory(SUBCAT_ADVANCED_MISC) 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_capability("keystore", 0)
set_callbacks(Open, Close) set_callbacks(Open, Close)
vlc_module_end () vlc_module_end ()
...@@ -481,7 +481,7 @@ Open(vlc_object_t *p_this) ...@@ -481,7 +481,7 @@ Open(vlc_object_t *p_this)
/* The p_sys context is shared and protected between all threads */ /* The p_sys context is shared and protected between all threads */
if (instance.i_ref_count == 0) 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) if (!psz_file)
return VLC_EGENERIC; return VLC_EGENERIC;
......
...@@ -47,7 +47,7 @@ static const struct ...@@ -47,7 +47,7 @@ static const struct
bool b_test_default; bool b_test_default;
} keystore_args[] = } keystore_args[] =
{ {
{ "plaintext", true }, { "memory", true },
/* Following keystores are tested only when asked explicitly by the tester /* Following keystores are tested only when asked explicitly by the tester
* (with "-a" argv) */ * (with "-a" argv) */
{ "secret", false }, { "secret", false },
...@@ -296,12 +296,12 @@ main(int i_argc, char *ppsz_argv[]) ...@@ -296,12 +296,12 @@ main(int i_argc, char *ppsz_argv[])
assert(asprintf(&ppsz_vlc_argv[0], "--keystore=%s,none", assert(asprintf(&ppsz_vlc_argv[0], "--keystore=%s,none",
psz_module) != -1); psz_module) != -1);
if (strcmp(psz_module, "plaintext") == 0) if (strcmp(psz_module, "memory") == 0)
{ {
assert((i_tmp_fd = mkstemp(psz_tmp_path)) != -1); assert((i_tmp_fd = mkstemp(psz_tmp_path)) != -1);
printf("plaintext tmp file: '%s'\n", psz_tmp_path); printf("plaintext tmp file: '%s'\n", psz_tmp_path);
assert(asprintf(&ppsz_vlc_argv[1], assert(asprintf(&ppsz_vlc_argv[1],
"--keystore-plaintext-file=%s", psz_tmp_path) != -1); "--keystore-file=%s", psz_tmp_path) != -1);
i_vlc_argc++; i_vlc_argc++;
} }
else if (strcmp(psz_module, "kwallet") == 0) else if (strcmp(psz_module, "kwallet") == 0)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment