diff --git a/C++/include/Swelio.h b/C++/include/Swelio.h index fa970be..8986682 100755 --- a/C++/include/Swelio.h +++ b/C++/include/Swelio.h @@ -1772,6 +1772,13 @@ void WINAPI IgnoreServiceEvents(BOOL value); /// None void WINAPI IgnoreHardwareEvents(BOOL value); +/// +/// Ignore Unknown cards insert / remove events +/// +/// true - to ignore unknown cards remove / insert events +/// None +void WINAPI IgnoreUnknownCards(BOOL value); + // Summary: // Digitally sign PDF file using Belgian EID card // Description: diff --git a/C++/lib/Swelio32.lib b/C++/lib/Swelio32.lib index ba1215e..bc4c7c0 100755 Binary files a/C++/lib/Swelio32.lib and b/C++/lib/Swelio32.lib differ diff --git a/C++/lib/Swelio64.lib b/C++/lib/Swelio64.lib index fcf98de..1790b5a 100755 Binary files a/C++/lib/Swelio64.lib and b/C++/lib/Swelio64.lib differ diff --git a/Redist/Swelio32.dll b/Redist/Swelio32.dll index 1f03126..c76fdbe 100644 Binary files a/Redist/Swelio32.dll and b/Redist/Swelio32.dll differ diff --git a/Redist/Swelio64.dll b/Redist/Swelio64.dll index f2832dd..f94e7fc 100644 Binary files a/Redist/Swelio64.dll and b/Redist/Swelio64.dll differ diff --git a/Samples/C#/EIDTestApp/EIDTestApp.csproj b/Samples/C#/EIDTestApp/EIDTestApp.csproj index 6c26e5a..784a285 100755 --- a/Samples/C#/EIDTestApp/EIDTestApp.csproj +++ b/Samples/C#/EIDTestApp/EIDTestApp.csproj @@ -16,7 +16,7 @@ 3.5 - v4.7 + v4.8 publish\ true diff --git a/Samples/C#/EIDTestApp/FormMain.cs b/Samples/C#/EIDTestApp/FormMain.cs index b90fbd2..4e08f04 100755 --- a/Samples/C#/EIDTestApp/FormMain.cs +++ b/Samples/C#/EIDTestApp/FormMain.cs @@ -183,8 +183,8 @@ private void ActivateCardEventsTracing() engine.CardInserted += new EventHandler(engine_CardInserted); engine.CardRemoved += new EventHandler(engine_CardRemoved); engine.ReadersListChanged += new EventHandler(engine_ReadersListChanged); - engine.TraceHardwareEvents = true; - engine.TraceServiceEvents = true; + engine.TraceHardwareEvents = false; + engine.TraceServiceEvents = false; engine.TraceEvents = true; } diff --git a/Samples/C#/EIDTestApp/Properties/Resources.Designer.cs b/Samples/C#/EIDTestApp/Properties/Resources.Designer.cs index 4cf52e3..45ee490 100755 --- a/Samples/C#/EIDTestApp/Properties/Resources.Designer.cs +++ b/Samples/C#/EIDTestApp/Properties/Resources.Designer.cs @@ -19,7 +19,7 @@ namespace EIDTestApp.Properties { // 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", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { diff --git a/Samples/C#/EIDTestApp/Properties/Settings.Designer.cs b/Samples/C#/EIDTestApp/Properties/Settings.Designer.cs index 4cc3e69..aa8de06 100755 --- a/Samples/C#/EIDTestApp/Properties/Settings.Designer.cs +++ b/Samples/C#/EIDTestApp/Properties/Settings.Designer.cs @@ -12,7 +12,7 @@ namespace EIDTestApp.Properties { [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.10.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.11.0.0")] internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); diff --git a/Samples/C#/EIDTestApp/app.config b/Samples/C#/EIDTestApp/app.config index 245587d..3e0e37c 100755 --- a/Samples/C#/EIDTestApp/app.config +++ b/Samples/C#/EIDTestApp/app.config @@ -1,3 +1,3 @@ - + diff --git a/Samples/C#/PDFSignature/PDFSignature/Program.cs b/Samples/C#/PDFSignature/PDFSignature/Program.cs index 9c1f05e..d647f52 100644 --- a/Samples/C#/PDFSignature/PDFSignature/Program.cs +++ b/Samples/C#/PDFSignature/PDFSignature/Program.cs @@ -11,14 +11,17 @@ class Program { static void Main(string[] args) { - PdfDocument pdf = new PdfDocument(args[0]); - Manager manager = new Manager(); - manager.Active = true; - manager.GetReader(0).ActivateCard(); - pdf.SelectCertificate(0); - pdf.Sign(); - pdf.Close(); - manager.Active = false; + if (args.Length > 0) + { + PdfDocument pdf = new PdfDocument(args[0]); + Manager manager = new Manager(); + manager.Active = true; + manager.GetReader(0).ActivateCard(); + pdf.SelectCertificate(0); + pdf.Sign(); + pdf.Close(); + manager.Active = false; + } } } } diff --git a/Samples/C#/PhotoMimeEncoding/PhotoMimeEncoding.csproj b/Samples/C#/PhotoMimeEncoding/PhotoMimeEncoding.csproj index b9f56d1..a64b3d1 100755 --- a/Samples/C#/PhotoMimeEncoding/PhotoMimeEncoding.csproj +++ b/Samples/C#/PhotoMimeEncoding/PhotoMimeEncoding.csproj @@ -10,7 +10,7 @@ Properties PhotoMimeEncoding PhotoMimeEncoding - v4.0 + v4.8 512 @@ -42,6 +42,7 @@ DEBUG;TRACE prompt 4 + false pdbonly @@ -50,6 +51,7 @@ TRACE prompt 4 + false @@ -60,12 +62,6 @@ - - - {AACADA10-0AB6-4845-8B13-87A7FA86AE69} - Swelio.Engine - - diff --git a/Samples/C#/PhotoMimeEncoding/PhotoMimeEncoding.sln b/Samples/C#/PhotoMimeEncoding/PhotoMimeEncoding.sln index 08e3ee7..9e4f9f7 100755 --- a/Samples/C#/PhotoMimeEncoding/PhotoMimeEncoding.sln +++ b/Samples/C#/PhotoMimeEncoding/PhotoMimeEncoding.sln @@ -1,14 +1,9 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2013 -VisualStudioVersion = 12.0.40629.0 +# Visual Studio Version 17 +VisualStudioVersion = 17.11.35327.3 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PhotoMimeEncoding", "PhotoMimeEncoding.csproj", "{170135AC-25B3-436B-8491-417AF9CF650A}" - ProjectSection(ProjectDependencies) = postProject - {AACADA10-0AB6-4845-8B13-87A7FA86AE69} = {AACADA10-0AB6-4845-8B13-87A7FA86AE69} - EndProjectSection -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Swelio.Engine", "..\..\..\Binding\C#\Swelio.Engine\Swelio.Engine\Swelio.Engine.csproj", "{AACADA10-0AB6-4845-8B13-87A7FA86AE69}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -28,18 +23,6 @@ Global {170135AC-25B3-436B-8491-417AF9CF650A}.Release|Any CPU.Build.0 = Release|Any CPU {170135AC-25B3-436B-8491-417AF9CF650A}.Release|x64.ActiveCfg = Release|Any CPU {170135AC-25B3-436B-8491-417AF9CF650A}.Release|x86.ActiveCfg = Release|Any CPU - {AACADA10-0AB6-4845-8B13-87A7FA86AE69}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AACADA10-0AB6-4845-8B13-87A7FA86AE69}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AACADA10-0AB6-4845-8B13-87A7FA86AE69}.Debug|x64.ActiveCfg = Debug|x64 - {AACADA10-0AB6-4845-8B13-87A7FA86AE69}.Debug|x64.Build.0 = Debug|x64 - {AACADA10-0AB6-4845-8B13-87A7FA86AE69}.Debug|x86.ActiveCfg = Debug|x86 - {AACADA10-0AB6-4845-8B13-87A7FA86AE69}.Debug|x86.Build.0 = Debug|x86 - {AACADA10-0AB6-4845-8B13-87A7FA86AE69}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AACADA10-0AB6-4845-8B13-87A7FA86AE69}.Release|Any CPU.Build.0 = Release|Any CPU - {AACADA10-0AB6-4845-8B13-87A7FA86AE69}.Release|x64.ActiveCfg = Release|x64 - {AACADA10-0AB6-4845-8B13-87A7FA86AE69}.Release|x64.Build.0 = Release|x64 - {AACADA10-0AB6-4845-8B13-87A7FA86AE69}.Release|x86.ActiveCfg = Release|x86 - {AACADA10-0AB6-4845-8B13-87A7FA86AE69}.Release|x86.Build.0 = Release|x86 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/Samples/C#/PhotoMimeEncoding/app.config b/Samples/C#/PhotoMimeEncoding/app.config index fcd0c93..3e0e37c 100755 --- a/Samples/C#/PhotoMimeEncoding/app.config +++ b/Samples/C#/PhotoMimeEncoding/app.config @@ -1,3 +1,3 @@ - + diff --git a/Samples/C#/Signature/Signature/Signature.csproj b/Samples/C#/Signature/Signature/Signature.csproj index 17cdb75..73cdc1c 100755 --- a/Samples/C#/Signature/Signature/Signature.csproj +++ b/Samples/C#/Signature/Signature/Signature.csproj @@ -9,7 +9,7 @@ Properties Signature Signature - v4.7.2 + v4.8 512 diff --git a/Samples/C#/Signature/Signature/app.config b/Samples/C#/Signature/Signature/app.config index 312bb3f..3e0e37c 100755 --- a/Samples/C#/Signature/Signature/app.config +++ b/Samples/C#/Signature/Signature/app.config @@ -1,3 +1,3 @@ - + diff --git a/Swelio.Engine/Swelio.Engine/Manager.cs b/Swelio.Engine/Swelio.Engine/Manager.cs index a6d02b7..205f23b 100644 --- a/Swelio.Engine/Swelio.Engine/Manager.cs +++ b/Swelio.Engine/Swelio.Engine/Manager.cs @@ -22,6 +22,7 @@ public sealed class Manager : IDisposable private bool traceEvents; private bool traceServiceEvents; private bool traceHardwareEvents; + private bool ignoreUnknownCards; private ReaderCallbackDelegate InternalCallbackDelegate; @@ -31,8 +32,9 @@ public sealed class Manager : IDisposable public Manager() { readers = new List(); - traceHardwareEvents = true; - traceServiceEvents = true; + traceHardwareEvents = false; //Do not trace card readers list change events + traceServiceEvents = false; //Do not trace service start and stop + ignoreUnknownCards = true; //Ignore unsopported cards insertion / removal InternalCallbackDelegate = new ReaderCallbackDelegate(EventTracer); } @@ -169,6 +171,16 @@ public bool TraceHardwareEvents } } + public bool IgnoreUnknownCards + { + get { return ignoreUnknownCards; } + set + { + ignoreUnknownCards = value; + NativeMethods.IgnoreUnknownCards(value); + } + } + public event EventHandler CardInserted; public event EventHandler CardRemoved; public event EventHandler ReadersListChanged; diff --git a/Swelio.Engine/Swelio.Engine/NativeMethods.cs b/Swelio.Engine/Swelio.Engine/NativeMethods.cs index c61eec8..7c9bc7c 100644 --- a/Swelio.Engine/Swelio.Engine/NativeMethods.cs +++ b/Swelio.Engine/Swelio.Engine/NativeMethods.cs @@ -393,6 +393,9 @@ internal static class NativeMethods [DllImport(DLL_FILE_NAME, EntryPoint = "IgnoreHardwareEvents", CallingConvention = CallingConvention.StdCall, CharSet = CharSet.Unicode)] public static extern void IgnoreHardwareEvents(bool value); + [DllImport(DLL_FILE_NAME, EntryPoint = "IgnoreUnknownCards", CallingConvention = CallingConvention.StdCall, CharSet = CharSet.Unicode)] + public static extern void IgnoreUnknownCards(bool value); + [DllImport(DLL_FILE_NAME, EntryPoint = "RemoveStartupW", CallingConvention = CallingConvention.StdCall, CharSet = CharSet.Unicode)] public static extern void RemoveStartup([MarshalAs(UnmanagedType.LPWStr)] string AppName); diff --git a/Swelio.Engine/Swelio.Engine/PdfDocument.cs b/Swelio.Engine/Swelio.Engine/PdfDocument.cs index 218fcf5..8ede214 100644 --- a/Swelio.Engine/Swelio.Engine/PdfDocument.cs +++ b/Swelio.Engine/Swelio.Engine/PdfDocument.cs @@ -6,6 +6,9 @@ namespace Swelio.Engine { + /// + /// The digital signature for PDF documents + /// public class PdfDocument { private string fileName; @@ -14,6 +17,10 @@ public class PdfDocument private bool certificateSelected = false; + /// + /// Initializes a new instance of the class. + /// + /// The file name. public PdfDocument(string fileName) { this.fileName = fileName; diff --git a/Swelio.Engine/Swelio.Engine/Swelio.Engine.csproj b/Swelio.Engine/Swelio.Engine/Swelio.Engine.csproj index fbb71e5..44acb1a 100644 --- a/Swelio.Engine/Swelio.Engine/Swelio.Engine.csproj +++ b/Swelio.Engine/Swelio.Engine/Swelio.Engine.csproj @@ -1,8 +1,8 @@  - net462;net472;net48 + net462;net472;net48;net8.0 true - 1.18.29 + 1.18.30 Serhiy Perevoznyk Serhiy Perevoznyk Swelio @@ -13,7 +13,7 @@ https://github.com/perevoznyk/swelio-sdk https://github.com/perevoznyk Swelio_icon.png - Copyright © Serhiy Perevoznyk 2014-2023 + Copyright © Serhiy Perevoznyk 2014-2024 Belgian eID card SDK true enginekey.snk @@ -43,4 +43,7 @@ true + + +