From 83f74c4123f77387bf44280c7d2da3b7cb6df958 Mon Sep 17 00:00:00 2001 From: Martin Baulig Date: Wed, 7 Jun 2017 11:46:21 -0400 Subject: [PATCH] [System]: Fix possible initialization issue in MonoTlsProviderFactory. (#4987) * [Mono.Security]: Add test for MonoTlsProviderFactory.GetProvider (). * [System]: Fix possible initialization issue in MonoTlsProviderFactory. --- .../Mono.Security_test.dll.sources | 1 + .../Mono.Security.Interface/TestProvider.cs | 48 +++++++++++++++++++ .../MonoTlsProviderFactory.cs | 2 + 3 files changed, 51 insertions(+) create mode 100644 mcs/class/Mono.Security/Test/Mono.Security.Interface/TestProvider.cs diff --git a/mcs/class/Mono.Security/Mono.Security_test.dll.sources b/mcs/class/Mono.Security/Mono.Security_test.dll.sources index 9d5ac35f66a..c9e33efc770 100644 --- a/mcs/class/Mono.Security/Mono.Security_test.dll.sources +++ b/mcs/class/Mono.Security/Mono.Security_test.dll.sources @@ -27,6 +27,7 @@ Mono.Security.Cryptography/PKCS8Test.cs Mono.Security.Cryptography/RSAManagedTest.cs Mono.Security.Cryptography/SHA224ManagedTest.cs Mono.Security.Cryptography/SHA224Test.cs +Mono.Security.Interface/TestProvider.cs Mono.Security.Protocol.Ntlm/ChallengeResponseTest.cs Mono.Security.Protocol.Ntlm/MessageBaseTest.cs Mono.Security.Protocol.Ntlm/Type1MessageTest.cs diff --git a/mcs/class/Mono.Security/Test/Mono.Security.Interface/TestProvider.cs b/mcs/class/Mono.Security/Test/Mono.Security.Interface/TestProvider.cs new file mode 100644 index 00000000000..a57cfe1105d --- /dev/null +++ b/mcs/class/Mono.Security/Test/Mono.Security.Interface/TestProvider.cs @@ -0,0 +1,48 @@ +// +// TestProvider.cs +// +// Author: +// Martin Baulig +// +// Copyright (c) 2017 Xamarin, Inc. +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in +// all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +// THE SOFTWARE. +using System; +using System.IO; +using System.Security.Cryptography; +using System.Text; + +using Mono.Security; +using Mono.Security.Interface; +using NUnit.Framework; + +namespace MonoTests.Mono.Security +{ + [TestFixture] + public class TestProvider + { + [Test] + [Category ("Martin")] + public void GetProvider () + { + var provider = MonoTlsProviderFactory.GetProvider (); + Assert.IsNotNull (provider, "TLS Provider"); + } + } +} diff --git a/mcs/class/System/Mono.Net.Security/MonoTlsProviderFactory.cs b/mcs/class/System/Mono.Net.Security/MonoTlsProviderFactory.cs index 96d81315139..660e3b41bb6 100644 --- a/mcs/class/System/Mono.Net.Security/MonoTlsProviderFactory.cs +++ b/mcs/class/System/Mono.Net.Security/MonoTlsProviderFactory.cs @@ -83,6 +83,8 @@ namespace Mono.Net.Security if (initialized) return; + InitializeProviderRegistration (); + MSI.MonoTlsProvider provider; try { provider = CreateDefaultProviderImpl (); -- 2.25.1