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 ba276e8b8ac32bf42ec1feda463c0a8ee84fe59f.
This commit is contained in:
Jo Shields 2017-02-15 09:59:48 +00:00
parent 22decdab13
commit 508f0381cb
2 changed files with 0 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
4357.diff
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);

2
mono-core.spec
View File

@ -36,7 +36,6 @@ License: LGPL-2.1 and MIT and MS-PL
Group: Development/Languages/Mono
Url: http://www.mono-project.com
Source0: http://download.mono-project.com/sources/mono/mono-%{version}.tar.bz2
Patch0: 4357.diff
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: bison
@ -132,7 +131,6 @@ technologies that have been submitted to the ECMA for standardization.
%prep
%setup -q -n mono-%{__majorver}
%patch0 -p1
%build
./autogen.sh