diff --git a/4357.diff b/4357.diff new file mode 100644 index 0000000000..e1b3f39418 --- /dev/null +++ b/4357.diff @@ -0,0 +1,22 @@ +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/mono-core.spec b/mono-core.spec index d6cd098eaa..ef93c706a0 100644 --- a/mono-core.spec +++ b/mono-core.spec @@ -36,6 +36,7 @@ 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 @@ -131,6 +132,7 @@ technologies that have been submitted to the ECMA for standardization. %prep %setup -q -n mono-%{__majorver} +%patch0 -p1 %build ./autogen.sh