Rename SettingValue to Setting. (#286)

Breaking change, but the crate is fresh and there's time to yank and
republish.
This commit is contained in:
Tony Arcieri (iqlusion)
2021-07-12 17:36:42 -07:00
committed by GitHub
parent 224d346f09
commit 42ae5fb974
3 changed files with 12 additions and 12 deletions
+5 -5
View File
@@ -48,7 +48,7 @@ use crate::{
error::{Error, Result},
policy::{PinPolicy, TouchPolicy},
serialization::*,
settings,
setting,
yubikey::YubiKey,
Buffer, ObjectId,
};
@@ -481,7 +481,7 @@ pub fn generate(
const SZ_ROCA_BLOCK_ADMIN: &str = "was blocked due to an administrator configuration setting.";
const SZ_ROCA_DEFAULT: &str = "was permitted by default, but is not recommended. The default behavior will change in a future Yubico release.";
let setting_roca: settings::SettingValue;
let setting_roca: setting::Setting;
match algorithm {
AlgorithmId::Rsa1024 | AlgorithmId::Rsa2048 => {
@@ -489,17 +489,17 @@ pub fn generate(
&& (yubikey.version.minor < 3
|| yubikey.version.minor == 3 && (yubikey.version.patch < 5))
{
setting_roca = settings::SettingValue::get(SZ_SETTING_ROCA, true);
setting_roca = setting::Setting::get(SZ_SETTING_ROCA, true);
let psz_msg = match setting_roca.source {
settings::SettingSource::User => {
setting::SettingSource::User => {
if setting_roca.value {
SZ_ROCA_ALLOW_USER
} else {
SZ_ROCA_BLOCK_USER
}
}
settings::SettingSource::Admin => {
setting::SettingSource::Admin => {
if setting_roca.value {
SZ_ROCA_ALLOW_ADMIN
} else {