mirror of https://code.videolan.org/videolan/vlc
Merge branch 'system_ciphers' into 'master'
Use SYSTEM wide ciphers for gnutls See merge request videolan/vlc!3798
This commit is contained in:
commit
ca27e5b2e7
|
@ -739,12 +739,14 @@ error:
|
|||
"hash functions and compression methods can be selected. " \
|
||||
"Refer to GNU TLS documentation for detailed syntax.")
|
||||
static const char *const priorities_values[] = {
|
||||
"@SYSTEM",
|
||||
"PERFORMANCE",
|
||||
"NORMAL",
|
||||
"SECURE128",
|
||||
"SECURE256",
|
||||
};
|
||||
static const char *const priorities_text[] = {
|
||||
N_("System (default to system crypto ciphers policy)"),
|
||||
N_("Performance (prioritize faster ciphers)"),
|
||||
N_("Normal"),
|
||||
N_("Secure 128-bit (or higher)"),
|
||||
|
@ -761,7 +763,7 @@ vlc_module_begin ()
|
|||
SYSTEM_TRUST_LONGTEXT)
|
||||
add_string("gnutls-dir-trust", NULL, DIR_TRUST_TEXT,
|
||||
DIR_TRUST_LONGTEXT)
|
||||
add_string ("gnutls-priorities", "NORMAL", PRIORITIES_TEXT,
|
||||
add_string ("gnutls-priorities", "@SYSTEM", PRIORITIES_TEXT,
|
||||
PRIORITIES_LONGTEXT)
|
||||
change_string_list (priorities_values, priorities_text)
|
||||
#ifdef ENABLE_SOUT
|
||||
|
|
Loading…
Reference in New Issue