From 272e5b926a00b55e533b2db98a46a71d87838b4f Mon Sep 17 00:00:00 2001 From: Daniel Date: Tue, 24 Sep 2019 14:39:09 +0200 Subject: [PATCH] Fix config registration in api and random --- api/config.go | 4 +++- crypto/random/rng.go | 12 ++++++++---- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/api/config.go b/api/config.go index 7a272c6..375762c 100644 --- a/api/config.go +++ b/api/config.go @@ -37,8 +37,9 @@ func registerConfig() error { Name: "API Address", Key: "api/listenAddress", Description: "Define on which IP and port the API should listen on.", - ExpertiseLevel: config.ExpertiseLevelDeveloper, OptType: config.OptTypeString, + ExpertiseLevel: config.ExpertiseLevelDeveloper, + ReleaseLevel: config.ReleaseLevelStable, DefaultValue: getDefaultListenAddress(), ValidationRegex: "^([0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}:[0-9]{1,5}|\\[[:0-9A-Fa-f]+\\]:[0-9]{1,5})$", RequiresRestart: true, @@ -53,5 +54,6 @@ func registerConfig() error { // SetDefaultAPIListenAddress sets the default listen address for the API. func SetDefaultAPIListenAddress(address string) { + defaultListenAddress = address } diff --git a/crypto/random/rng.go b/crypto/random/rng.go index fde2f45..09be8ba 100644 --- a/crypto/random/rng.go +++ b/crypto/random/rng.go @@ -31,8 +31,9 @@ func prep() error { Name: "RNG Cipher", Key: "random/rng_cipher", Description: "Cipher to use for the Fortuna RNG. Requires restart to take effect.", - ExpertiseLevel: config.ExpertiseLevelDeveloper, OptType: config.OptTypeString, + ExpertiseLevel: config.ExpertiseLevelDeveloper, + ReleaseLevel: config.ReleaseLevelExperimental, ExternalOptType: "string list", DefaultValue: "aes", ValidationRegex: "^(aes|serpent)$", @@ -46,8 +47,9 @@ func prep() error { Name: "Minimum Feed Entropy", Key: "random/min_feed_entropy", Description: "The minimum amount of entropy before a entropy source is feed to the RNG, in bits.", - ExpertiseLevel: config.ExpertiseLevelDeveloper, OptType: config.OptTypeInt, + ExpertiseLevel: config.ExpertiseLevelDeveloper, + ReleaseLevel: config.ReleaseLevelExperimental, DefaultValue: 256, ValidationRegex: "^[0-9]{3,5}$", }) @@ -60,8 +62,9 @@ func prep() error { Name: "Reseed after x seconds", Key: "random/reseed_after_seconds", Description: "Number of seconds until reseed", - ExpertiseLevel: config.ExpertiseLevelDeveloper, OptType: config.OptTypeInt, + ExpertiseLevel: config.ExpertiseLevelDeveloper, + ReleaseLevel: config.ReleaseLevelExperimental, DefaultValue: 360, // ten minutes ValidationRegex: "^[1-9][0-9]{1,5}$", }) @@ -74,8 +77,9 @@ func prep() error { Name: "Reseed after x bytes", Key: "random/reseed_after_bytes", Description: "Number of fetched bytes until reseed", - ExpertiseLevel: config.ExpertiseLevelDeveloper, OptType: config.OptTypeInt, + ExpertiseLevel: config.ExpertiseLevelDeveloper, + ReleaseLevel: config.ReleaseLevelExperimental, DefaultValue: 1000000, // one megabyte ValidationRegex: "^[1-9][0-9]{2,9}$", })