From e67feecd14933a2dd1047904b25c6666d8ece32f Mon Sep 17 00:00:00 2001 From: Jo Shields Date: Wed, 15 Feb 2017 10:01:51 +0000 Subject: [PATCH] Revert "Add patch for ~/.config/.mono cert-sync issue" This reverts commit 19ce9ae593ecab26cd998c5adcd68a46f5b5539d [formerly f5f37c02b09eb9c94f8dd76b463906d42ab6b811]. Former-commit-id: 96b29f55e6591e49f0af9c6dbcd2592b7136398f --- debian/patches/4357.diff | 22 ---------------------- debian/patches/series | 1 - 2 files changed, 23 deletions(-) delete mode 100644 debian/patches/4357.diff delete mode 100644 debian/patches/series diff --git a/debian/patches/4357.diff b/debian/patches/4357.diff deleted file mode 100644 index e1b3f39418..0000000000 --- a/debian/patches/4357.diff +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/mcs/class/Mono.Security/Mono.Security.X509/X509Store.cs b/mcs/class/Mono.Security/Mono.Security.X509/X509Store.cs -index 536782f..1821075 100644 ---- a/mcs/class/Mono.Security/Mono.Security.X509/X509Store.cs -+++ b/mcs/class/Mono.Security/Mono.Security.X509/X509Store.cs -@@ -163,7 +163,7 @@ public void Import (X509Certificate certificate) - cspParams.KeyContainerName = CryptoConvert.ToHex (certificate.Hash); - - // Right now this seems to be the best way to know if we should use LM store.. ;) -- if (_storePath.StartsWith (X509StoreManager.LocalMachinePath)) -+ if (_storePath.StartsWith (X509StoreManager.LocalMachinePath) || _storePath.StartsWith(X509StoreManager.NewLocalMachinePath)) - cspParams.Flags = CspProviderFlags.UseMachineKeyStore; - - ImportPrivateKey (certificate, cspParams); -@@ -338,7 +338,7 @@ private X509Certificate LoadCertificate (string filename) - // If privateKey it's available, load it too.. - CspParameters cspParams = new CspParameters (); - cspParams.KeyContainerName = CryptoConvert.ToHex (cert.Hash); -- if (_storePath.StartsWith (X509StoreManager.LocalMachinePath)) -+ if (_storePath.StartsWith (X509StoreManager.LocalMachinePath) || _storePath.StartsWith(X509StoreManager.NewLocalMachinePath)) - cspParams.Flags = CspProviderFlags.UseMachineKeyStore; - KeyPairPersistence kpp = new KeyPairPersistence (cspParams); - diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index 692344afe3..0000000000 --- a/debian/patches/series +++ /dev/null @@ -1 +0,0 @@ -4357.diff