From 6d177898a9a5883ad7939be162e51d9a61d0e0b1 Mon Sep 17 00:00:00 2001
From: Brad Kittenbrink <brad@lindenlab.com>
Date: Mon, 13 Dec 2021 14:58:38 -0800
Subject: SL-16501 SLMFAHash is now saved client side

---
 indra/newview/app_settings/settings_per_account.xml | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'indra/newview/app_settings')

diff --git a/indra/newview/app_settings/settings_per_account.xml b/indra/newview/app_settings/settings_per_account.xml
index 537744b44c..d7d008689c 100644
--- a/indra/newview/app_settings/settings_per_account.xml
+++ b/indra/newview/app_settings/settings_per_account.xml
@@ -436,5 +436,16 @@
         <key>Value</key>
         <integer>2</integer>
       </map>
+      <key>SLMFAHash</key>
+      <map>
+        <key>Comment</key>
+        <string>MFA state hash for authentication</string>
+        <key>Persist</key>
+        <integer>1</integer>
+        <key>Type</key>
+        <string>String</string>
+        <key>Value</key>
+        <string></string>
+      </map>
     </map>
 </llsd>
-- 
cgit v1.2.3


From 96a6d21086353639d48befa20d86c97d2fd2dddb Mon Sep 17 00:00:00 2001
From: Brad Kittenbrink <brad@lindenlab.com>
Date: Fri, 14 Jan 2022 22:24:52 -0800
Subject: SL-16514 store mfa hash in protected data using LLSecAPIBasicHandler

---
 indra/newview/app_settings/settings_per_account.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/app_settings')

diff --git a/indra/newview/app_settings/settings_per_account.xml b/indra/newview/app_settings/settings_per_account.xml
index d7d008689c..7d4af7db7f 100644
--- a/indra/newview/app_settings/settings_per_account.xml
+++ b/indra/newview/app_settings/settings_per_account.xml
@@ -441,7 +441,7 @@
         <key>Comment</key>
         <string>MFA state hash for authentication</string>
         <key>Persist</key>
-        <integer>1</integer>
+        <integer>0</integer>
         <key>Type</key>
         <string>String</string>
         <key>Value</key>
-- 
cgit v1.2.3


From 8422183958a54e49c230bf85743336e0dd4dff71 Mon Sep 17 00:00:00 2001
From: Brad Kittenbrink <brad@lindenlab.com>
Date: Fri, 4 Feb 2022 14:03:05 -0800
Subject: Related to fix for SL-16792, standardize on naming the filed simply
 mfa_hash end-to-end to avoid confusion

---
 indra/newview/app_settings/settings_per_account.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/app_settings')

diff --git a/indra/newview/app_settings/settings_per_account.xml b/indra/newview/app_settings/settings_per_account.xml
index 7d4af7db7f..c45e841b94 100644
--- a/indra/newview/app_settings/settings_per_account.xml
+++ b/indra/newview/app_settings/settings_per_account.xml
@@ -436,7 +436,7 @@
         <key>Value</key>
         <integer>2</integer>
       </map>
-      <key>SLMFAHash</key>
+      <key>MFAHash</key>
       <map>
         <key>Comment</key>
         <string>MFA state hash for authentication</string>
-- 
cgit v1.2.3


From 6bdd744d78f2040767abe57afcb06f8a55a9dd83 Mon Sep 17 00:00:00 2001
From: Brad Kittenbrink <brad@lindenlab.com>
Date: Wed, 9 Mar 2022 14:13:02 -0800
Subject: SL-17019 mfa_hash should get saved per-username

---
 indra/newview/app_settings/settings.xml             | 11 +++++++++++
 indra/newview/app_settings/settings_per_account.xml | 11 -----------
 2 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'indra/newview/app_settings')

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 6c36fa6f09..7d39a54c1d 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -16815,5 +16815,16 @@
   <key>Value</key>
   <integer>1</integer>
   </map>
+  <key>MFAHash</key>
+  <map>
+    <key>Comment</key>
+    <string>Override MFA state hash for authentication</string>
+    <key>Persist</key>
+    <integer>0</integer>
+    <key>Type</key>
+    <string>String</string>
+    <key>Value</key>
+    <string></string>
+  </map>
 </map>
 </llsd>
diff --git a/indra/newview/app_settings/settings_per_account.xml b/indra/newview/app_settings/settings_per_account.xml
index c45e841b94..537744b44c 100644
--- a/indra/newview/app_settings/settings_per_account.xml
+++ b/indra/newview/app_settings/settings_per_account.xml
@@ -436,16 +436,5 @@
         <key>Value</key>
         <integer>2</integer>
       </map>
-      <key>MFAHash</key>
-      <map>
-        <key>Comment</key>
-        <string>MFA state hash for authentication</string>
-        <key>Persist</key>
-        <integer>0</integer>
-        <key>Type</key>
-        <string>String</string>
-        <key>Value</key>
-        <string></string>
-      </map>
     </map>
 </llsd>
-- 
cgit v1.2.3