Merge 63ffab9ee4 into 315ffffeec

Merge branch 'SoftEtherVPN:master' into quantum-safe-key-agreement
Fix incorrect PQ_GROUP_LIST string
2026-04-22 23:09:27 +03:00 · 2024-05-21 04:06:26 +00:00 · 2024-05-20 23:20:52 -04:00 · 2024-05-20 21:46:57 -04:00 · 2024-05-20 19:48:23 -04:00 · 2024-05-20 23:37:52 +02:00
6 changed files with 17 additions and 4 deletions
@@ -7,7 +7,7 @@ jobs:
  build_and_test:
    strategy:
      matrix:
-        os: [macos-13, macos-12, macos-11]
+        os: [macos-14, macos-13, macos-12]
    name: ${{ matrix.os }}
    runs-on: ${{ matrix.os }}
    steps:
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.10)
 set(BUILD_NUMBER CACHE STRING "The number of the current build.")

 if ("${BUILD_NUMBER}" STREQUAL "")
-	set(BUILD_NUMBER "5184")
+	set(BUILD_NUMBER "5185")
 endif()

 if (BUILD_NUMBER LESS 5180)
@@ -1,5 +1,5 @@
 {
-  "environments": [ { "BuildNumber": "5184" } ],
+  "environments": [ { "BuildNumber": "5185" } ],
  "configurations": [
    {
      "name": "x64-native",
@@ -88,6 +88,7 @@ int ssl_clientcert_index = 0;
 #if OPENSSL_VERSION_NUMBER >= 0x30000000L
 static OSSL_PROVIDER *ossl_provider_legacy = NULL;
 static OSSL_PROVIDER *ossl_provider_default = NULL;
+static OSSL_PROVIDER *ossl_provider_oqsprovider = NULL;
 #endif

 LOCK **ssl_lock_obj = NULL;
@@ -3974,6 +3975,12 @@ void FreeCryptLibrary()
 		OSSL_PROVIDER_unload(ossl_provider_legacy);
 		ossl_provider_legacy = NULL;
 	}
+
+	if (ossl_provider_oqsprovider != NULL)
+	{
+		OSSL_PROVIDER_unload(ossl_provider_oqsprovider);
+		ossl_provider_oqsprovider = NULL;
+	}
 #endif
 }

@@ -3996,6 +4003,7 @@ void InitCryptLibrary()
 #if OPENSSL_VERSION_NUMBER >= 0x30000000L
 	ossl_provider_default = OSSL_PROVIDER_load(NULL, "legacy");
 	ossl_provider_legacy = OSSL_PROVIDER_load(NULL, "default");
+	ossl_provider_oqsprovider = OSSL_PROVIDER_load(NULL, "oqsprovider");
 #endif

 	ssl_clientcert_index = SSL_get_ex_new_index(0, "struct SslClientCertInfo *", NULL, NULL, NULL);
@@ -25,6 +25,7 @@

 #include <openssl/err.h>
 #include <openssl/ssl.h>
+#include <openssl/provider.h>

 #ifdef OS_UNIX
 #include <fcntl.h>
@@ -11905,6 +11906,8 @@ bool StartSSLEx3(SOCK *sock, X *x, K *priv, LIST *chain, UINT ssl_timeout, char
 		Unlock(openssl_lock);
 	}

+	SSL_set1_groups_list(sock->ssl, PQ_GROUP_LIST);
+
 	if (sock->ServerMode)
 	{
 //		Lock(ssl_connect_lock);
@@ -11984,7 +11987,7 @@ bool StartSSLEx3(SOCK *sock, X *x, K *priv, LIST *chain, UINT ssl_timeout, char
 		//		Unlock(ssl_connect_lock);
 	}
 	else
-	{
+	{	
 		prev_timeout = GetTimeout(sock);
 		SetTimeout(sock, ssl_timeout);
 		// Client mode
@@ -59,6 +59,8 @@ struct DYN_VALUE

 #define	DEFAULT_CIPHER_LIST			"ECDHE+AESGCM:ECDHE+CHACHA20:DHE+AESGCM:DHE+CHACHA20:ECDHE+AES256:DHE+AES256:RSA+AES"

+#define PQ_GROUP_LIST				"p521_kyber1024:x25519_kyber768:P-521:X25519:P-256"
+
 // SSL logging function
 //#define	ENABLE_SSL_LOGGING
 #define	SSL_LOGGING_DIRNAME			"@ssl_log"
Author	SHA1	Message	Date
siddharth-narayan	1cc639a77c	Merge `63ffab9ee4` into `315ffffeec`	2024-05-21 04:06:26 +00:00
siddharth-narayan	63ffab9ee4	Merge branch 'SoftEtherVPN:master' into quantum-safe-key-agreement	2024-05-20 23:20:52 -04:00
Siddharth	2fe4ca0f8c	Fix incorrect PQ_GROUP_LIST string	2024-05-20 21:46:57 -04:00
Siddharth	a50d8910ba	Add PQ Groups and the provider for them	2024-05-20 19:48:23 -04:00
Ilya Shipitsin	315ffffeec	Merge pull request #2001 from chipitsine/ci_drop_macos_11 CI: drop macos-11	2024-05-20 23:37:52 +02:00
Ilia Shipitsin	141060101d	CI: drop macos-11 more details: https://github.blog/changelog/2024-05-20-actions-upcoming-changes-to-github-hosted-macos-runners/	2024-05-20 21:50:07 +02:00
Ilya Shipitsin	7006539732	Merge pull request #1992 from chipitsine/macos_14 CI: add macos-14	2024-05-04 22:16:00 +02:00
Ilya Shipitsin	8ad34b2012	Merge pull request #1991 from chipitsine/master bump version for upcoming 5185 release	2024-05-04 22:04:21 +02:00
Ilia Shipitsin	186d48fba2	CI: add macos-14	2024-05-04 21:25:39 +02:00
Ilia Shipitsin	37231ac006	bump version for upcoming 5185 release	2024-05-04 21:23:00 +02:00