From ccff50e676f91e133bce09a7f32e724ce85fa86f Mon Sep 17 00:00:00 2001 From: Stephan Traub Date: Fri, 7 Feb 2020 16:49:04 +0100 Subject: [PATCH] Update .net version to 4.7 to support TLS 1.2 #32 --- privacyIDEAADFSProvider/Adapter.cs | 1 + privacyIDEAADFSProvider/AdapterPresentationForm.cs | 3 ++- privacyIDEAADFSProvider/Install/Install-ADFSProvider.ps1 | 2 +- privacyIDEAADFSProvider/Resources.Designer.cs | 6 +++--- privacyIDEAADFSProvider/privacyIDEAADFSProvider.csproj | 3 ++- 5 files changed, 9 insertions(+), 6 deletions(-) diff --git a/privacyIDEAADFSProvider/Adapter.cs b/privacyIDEAADFSProvider/Adapter.cs index 3e470d0..61e9e54 100644 --- a/privacyIDEAADFSProvider/Adapter.cs +++ b/privacyIDEAADFSProvider/Adapter.cs @@ -9,6 +9,7 @@ // old b6483f285cb7b6eb // new bf6bdb60967d5ecc 1.3.2 +// new namespace privacyIDEAADFSProvider { diff --git a/privacyIDEAADFSProvider/AdapterPresentationForm.cs b/privacyIDEAADFSProvider/AdapterPresentationForm.cs index 2385d88..55bbb41 100644 --- a/privacyIDEAADFSProvider/AdapterPresentationForm.cs +++ b/privacyIDEAADFSProvider/AdapterPresentationForm.cs @@ -7,7 +7,8 @@ class AdapterPresentationForm : IAdapterPresentationForm { public ADFSinterface[] inter; private bool error = false; - + + public AdapterPresentationForm(bool error, ADFSinterface[] adfsinter) { this.error = error; diff --git a/privacyIDEAADFSProvider/Install/Install-ADFSProvider.ps1 b/privacyIDEAADFSProvider/Install/Install-ADFSProvider.ps1 index c89b26d..732c5ff 100644 --- a/privacyIDEAADFSProvider/Install/Install-ADFSProvider.ps1 +++ b/privacyIDEAADFSProvider/Install/Install-ADFSProvider.ps1 @@ -38,7 +38,7 @@ if (!([System.Diagnostics.EventLog]::SourceExists("privacyIDEAProvider"))) Set-location "C:\Program Files\privacyIDEAProvider" Gac-Util "C:\Program Files\privacyIDEAProvider\privacyIDEA-ADFSProvider.dll" -$typeName = "privacyIDEAADFSProvider.Adapter, privacyIDEA-ADFSProvider, Version=1.3.5.0, Culture=neutral, PublicKeyToken=bf6bdb60967d5ecc" +$typeName = "privacyIDEAADFSProvider.Adapter, privacyIDEA-ADFSProvider, Version=1.3.6.0, Culture=neutral, PublicKeyToken=bf6bdb60967d5ecc" Register-AdfsAuthenticationProvider -TypeName $typeName -Name "privacyIDEA-ADFSProvider" -ConfigurationFilePath "C:\Program Files\privacyIDEAProvider\config.xml" -Verbose Restart-Service adfssrv \ No newline at end of file diff --git a/privacyIDEAADFSProvider/Resources.Designer.cs b/privacyIDEAADFSProvider/Resources.Designer.cs index e0a2f98..f444c84 100644 --- a/privacyIDEAADFSProvider/Resources.Designer.cs +++ b/privacyIDEAADFSProvider/Resources.Designer.cs @@ -19,7 +19,7 @@ namespace privacyIDEAADFSProvider { // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { @@ -67,8 +67,8 @@ internal Resources() { /// <input id="authMethod" type="hidden" name="AuthMethod" value="%AuthMethod%" /> /// <input id="context" type="hidden" name="Context" value="%Context%" /> /// <!-- End inputs are required by the presentation framework. --> - /// <p id="pageIntroductionText" style="color:red"> Wrong One-Time-Password. Please try again!</p> - /// [rest of string was truncated]";. + /// <!-- Inputs for session affinity - Do not modify or remove - See #14 --> + /// <input id="username" [rest of string was truncated]";. /// internal static string AuthError { get { diff --git a/privacyIDEAADFSProvider/privacyIDEAADFSProvider.csproj b/privacyIDEAADFSProvider/privacyIDEAADFSProvider.csproj index b858d67..9199817 100644 --- a/privacyIDEAADFSProvider/privacyIDEAADFSProvider.csproj +++ b/privacyIDEAADFSProvider/privacyIDEAADFSProvider.csproj @@ -9,8 +9,9 @@ Properties privacyIDEAADFSProvider privacyIDEA-ADFSProvider - v4.5 + v4.7.2 512 + true