From 73dc90109bbfb25651c3630faf458ed7a6662565 Mon Sep 17 00:00:00 2001 From: Benoit Jadinon Date: Thu, 16 Feb 2017 16:47:19 +0100 Subject: [PATCH 1/2] .ToLower() -> .ToLowerInvariant() --- src/KeyChain.Net.XamarinIOS/KeyChainHelper.cs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/KeyChain.Net.XamarinIOS/KeyChainHelper.cs b/src/KeyChain.Net.XamarinIOS/KeyChainHelper.cs index e6cd490..3da7728 100644 --- a/src/KeyChain.Net.XamarinIOS/KeyChainHelper.cs +++ b/src/KeyChain.Net.XamarinIOS/KeyChainHelper.cs @@ -92,8 +92,8 @@ private static SecStatusCode DeletePassword (string username, string serviceId, } // Querying is case sesitive - we don't want that. - username = username.ToLower ( ); - serviceId = serviceId.ToLower ( ); + username = username.ToLowerInvariant ( ); + serviceId = serviceId.ToLowerInvariant ( ); // Query and remove. SecRecord queryRec = new SecRecord ( SecKind.GenericPassword ) { Service = serviceId, Label = serviceId, Account = username, Synchronizable = synchronizable }; @@ -128,8 +128,8 @@ private static SecStatusCode SetPassword ( string username, string password, str } // Querying is case sesitive - we don't want that. - username = username.ToLower ( ); - serviceId = serviceId.ToLower ( ); + username = username.ToLowerInvariant ( ); + serviceId = serviceId.ToLowerInvariant ( ); // Don't bother updating. Delete existing record and create a new one. DeletePassword ( username, serviceId, synchronizable ); @@ -173,8 +173,8 @@ private static string GetPassword ( string username, string serviceId, bool sync } // Querying is case sesitive - we don't want that. - username = username.ToLower ( ); - serviceId = serviceId.ToLower ( ); + username = username.ToLowerInvariant ( ); + serviceId = serviceId.ToLowerInvariant ( ); SecStatusCode code; // Query the record. From f6866212d47ec75ecfff30e5b4b82ea44f2015fd Mon Sep 17 00:00:00 2001 From: Benoit Jadinon Date: Tue, 28 Feb 2017 09:12:06 +0100 Subject: [PATCH 2/2] ToLowerInvariant() on Android as well --- src/KeyChain.Net.XamarinAndroid/KeyChainHelper.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/KeyChain.Net.XamarinAndroid/KeyChainHelper.cs b/src/KeyChain.Net.XamarinAndroid/KeyChainHelper.cs index a7d5807..8d43b11 100644 --- a/src/KeyChain.Net.XamarinAndroid/KeyChainHelper.cs +++ b/src/KeyChain.Net.XamarinAndroid/KeyChainHelper.cs @@ -76,12 +76,12 @@ public KeyChainHelper(Func context, string keyStoreFileProtectionPasswo /// Keyname/username. public string GetKey (string keyName) { - var wantedAlias = MakeAlias(keyName, _serviceId).ToLower(); + var wantedAlias = MakeAlias(keyName, _serviceId).ToLowerInvariant(); var aliases = _androidKeyStore.Aliases (); while (aliases.HasMoreElements) { var alias = aliases.NextElement ().ToString (); - if (alias.ToLower().Contains(wantedAlias)) + if (alias.ToLowerInvariant().Contains(wantedAlias)) { var e = _androidKeyStore.GetEntry (alias, _passwordProtection) as KeyStore.SecretKeyEntry; if (e != null)