mono/linux-packaging-mono
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Add patch for ~/.config/.mono cert-sync issue"

Browse Source 
This reverts commit 19ce9ae593ecab26cd998c5adcd68a46f5b5539d [formerly f5f37c02b09eb9c94f8dd76b463906d42ab6b811].


Former-commit-id: 96b29f55e6591e49f0af9c6dbcd2592b7136398f
This commit is contained in:
Jo Shields 2017-02-15 10:01:51 +00:00
parent 9384b8ceb4
commit e67feecd14
2 changed files with 0 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
debian/patches/4357.diff vendored
View File

@ -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);

1
debian/patches/series vendored
View File

@ -1 +0,0 @@
4357.diff