From fc4f1cc5ae11a8da402e0bfc32faaeb891c8f400 Mon Sep 17 00:00:00 2001
From: "Daniel R. Schneider" <daniel.schneider@let.ethz.ch>
Date: Fri, 30 Aug 2019 23:54:33 +0200
Subject: [PATCH] Updated version number to 2.3 (final release). More eligible
 SSL/TLS certificates are displayed in the list "Choose TLS/SSL certificate to
 embed into configuration..." and the one for CA certificates in SEB Config
 Tool / Network / Certificates.

---
 .../SafeExamBrowser_2018.ism                  | Bin 335366 -> 335366 bytes
 .../SEBProtectionController.cs                |   8 ++++++--
 .../Properties/AssemblyInfo.cs                |   2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/InstallShield 2012 Spring Projects/SafeExamBrowser_2018.ism b/InstallShield 2012 Spring Projects/SafeExamBrowser_2018.ism
index 3828d8f94f4b60798a4beaf8fcb7ae938a85012f..0f4233f6a912c8e2ef5bfb45397ca74861951414 100644
GIT binary patch
delta 153
zcmV;K0A~M&ycCAK6tHX{1^}cSd?;VDav*Za0{{R3v*+oRjshMHhkkegw|;m6xM#Oq
z-~yySmM{Y*rXT|lw<a(H+E15Ve*-4AfCG301110gw|j&Gg$o2}Wo~qrU~mH$mz9wN
z54TW|1Iz;^dongbGDSBuF)cATLPjk#GBq(RIYu}%Ej2?yH$gZxHAO))IDLm4lmoXM
HlmzOD(Caa9

delta 155
zcmV;M0A&A$ycCAK6tHX{27pDJ69G=Mav*Za1110gv*+oRjskfGhkkegw|;m6xMwDN
zF*!IvG&MFwEkZR!MJ+T%H8(9mFh(>jH$p^4HAFZzHZ(FaeYZB?0;E5tAOjGW+8+ZZ
zwlD+QPqu&qcmx9g006gpgad^Om)d^=CYR1@0}+=CZUYLp8;}Fr0|8r?0rdhChcJ`_
Jw=k3h)`_q%GR^=1

diff --git a/SebWindowsClient/SebWindowsClient/CryptographyUtils/SEBProtectionController.cs b/SebWindowsClient/SebWindowsClient/CryptographyUtils/SEBProtectionController.cs
index d8c13c7..68fc446 100644
--- a/SebWindowsClient/SebWindowsClient/CryptographyUtils/SEBProtectionController.cs
+++ b/SebWindowsClient/SebWindowsClient/CryptographyUtils/SEBProtectionController.cs
@@ -145,11 +145,15 @@ public static ArrayList GetSSLCertificatesAndNames(ref ArrayList certificateName
 
             X509Store store = new X509Store(StoreName.CertificateAuthority);
             store.Open(OpenFlags.ReadOnly);
-            X509Certificate2Collection certsCollection = store.Certificates.Find(X509FindType.FindByKeyUsage, (X509KeyUsageFlags.DigitalSignature | X509KeyUsageFlags.KeyEncipherment), false);
+            X509Certificate2Collection certsCollection = store.Certificates.Find(X509FindType.FindByKeyUsage, (X509KeyUsageFlags.DigitalSignature), false);
+            X509Certificate2Collection certsCollection2 = store.Certificates.Find(X509FindType.FindByKeyUsage, (X509KeyUsageFlags.KeyEncipherment), false);
             store = new X509Store(StoreName.AddressBook);
             store.Open(OpenFlags.ReadOnly);
-            X509Certificate2Collection certsCollection2 = store.Certificates.Find(X509FindType.FindByKeyUsage, (X509KeyUsageFlags.DigitalSignature | X509KeyUsageFlags.KeyEncipherment), false);
+            X509Certificate2Collection certsCollection3 = store.Certificates.Find(X509FindType.FindByKeyUsage, (X509KeyUsageFlags.DigitalSignature), false);
+            X509Certificate2Collection certsCollection4 = store.Certificates.Find(X509FindType.FindByKeyUsage, (X509KeyUsageFlags.KeyEncipherment), false);
             certsCollection.AddRange(certsCollection2);
+            certsCollection.AddRange(certsCollection3);
+            certsCollection.AddRange(certsCollection4);
 
             foreach (X509Certificate2 x509Certificate in certsCollection)
             {
diff --git a/SebWindowsClient/SebWindowsClient/Properties/AssemblyInfo.cs b/SebWindowsClient/SebWindowsClient/Properties/AssemblyInfo.cs
index cf8e062..84a6e71 100644
--- a/SebWindowsClient/SebWindowsClient/Properties/AssemblyInfo.cs
+++ b/SebWindowsClient/SebWindowsClient/Properties/AssemblyInfo.cs
@@ -31,4 +31,4 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 [assembly: AssemblyVersion("2.3.*")]
-[assembly: AssemblyInformationalVersion("2.3pre4")]
+[assembly: AssemblyInformationalVersion("2.3")]