Pq mls ciphersuites

.github/workflows/benchmark-jvm.yml

@@ -45,7 +45,7 @@ on:
         required: false
         type: string
       benchmark_cipher_suites:
-        description: Comma-separated benchmark cipher suite names
+        description: Comma-separated benchmark cipher suite IDs
         required: false
         type: string
       publish:

.github/workflows/benchmark-ts-browser.yml

@@ -45,7 +45,7 @@ on:
         required: false
         type: string
       benchmark_cipher_suites:
-        description: Comma-separated benchmark cipher suite names
+        description: Comma-separated benchmark cipher suite IDs
         required: false
         type: string
       publish:

.github/workflows/benchmark-ts-native.yml

@@ -45,7 +45,7 @@ on:
         required: false
         type: string
       benchmark_cipher_suites:
-        description: Comma-separated benchmark cipher suite names
+        description: Comma-separated benchmark cipher suite IDs
         required: false
         type: string
       publish:

.github/workflows/benchmarks-pq.yml

@@ -0,0 +1,30 @@
+name: benchmarks-pq
+on:
+  schedule:
+    - cron: "0 4 * * *"
+  workflow_dispatch:
+
+jobs:
+  benchmark-jvm:
+    uses: ./.github/workflows/benchmark-jvm.yml
+    with:
+      runs_on: '["self-hosted", "benchmark"]'
+      benchmark_cipher_suites: "61441,61442,61443,61444,61445,61446,61447,61448,61449,61450,61451" # 0xF001-0xF00B
+    secrets:
+      METRICS_WRITER_PASSWORD: ${{ secrets.METRICS_WRITER_PASSWORD }}
+
+  benchmark-ts-browser:
+    uses: ./.github/workflows/benchmark-ts-browser.yml
+    with:
+      runs_on: '["self-hosted", "benchmark"]'
+      benchmark_cipher_suites: "61441,61442,61443,61444,61445,61446,61447,61448,61449,61450,61451" # 0xF001-0xF00B
+    secrets:
+      METRICS_WRITER_PASSWORD: ${{ secrets.METRICS_WRITER_PASSWORD }}
+
+  benchmark-ts-native:
+    uses: ./.github/workflows/benchmark-ts-native.yml
+    with:
+      runs_on: '["self-hosted", "benchmark"]'
+      benchmark_cipher_suites: "61441,61442,61443,61444,61445,61446,61447,61448,61449,61450,61451" # 0xF001-0xF00B
+    secrets:
+      METRICS_WRITER_PASSWORD: ${{ secrets.METRICS_WRITER_PASSWORD }}

Cargo.toml

@@ -129,10 +129,10 @@ reqwest = { version = "0.12", default-features = false, features = [
 testcontainers = { version = "0.28", features = ["reusable-containers"] }
 
 # our OpenMLS fork
-openmls = { git = "https://github.com/wireapp/openmls", rev = "9252caa031d874b2e6e2157db6b8024882eb72f3", version = "1" }
-openmls_basic_credential = { git = "https://github.com/wireapp/openmls", rev = "9252caa031d874b2e6e2157db6b8024882eb72f3", version = "0.2" }
-openmls_traits = { git = "https://github.com/wireapp/openmls", rev = "9252caa031d874b2e6e2157db6b8024882eb72f3", version = "0.2" }
-openmls_x509_credential = { git = "https://github.com/wireapp/openmls", rev = "9252caa031d874b2e6e2157db6b8024882eb72f3", version = "0.2" }
+openmls = { git = "https://github.com/wireapp/openmls", rev = "770733456132521ff13eb5212efcf56503f25a79", version = "1" }
+openmls_basic_credential = { git = "https://github.com/wireapp/openmls", rev = "770733456132521ff13eb5212efcf56503f25a79", version = "0.2" }
+openmls_traits = { git = "https://github.com/wireapp/openmls", rev = "770733456132521ff13eb5212efcf56503f25a79", version = "0.2" }
+openmls_x509_credential = { git = "https://github.com/wireapp/openmls", rev = "770733456132521ff13eb5212efcf56503f25a79", version = "0.2" }
 
 # proteus
 proteus-traits = { git = "https://github.com/wireapp/proteus", tag = "v3.0.1" }

crypto-ffi/bindings/jvm/src/jmh/kotlin/com/wire/benchmark/AddUser.kt

@@ -23,7 +23,7 @@ open class AddUser {
         "5",
         "7"
     )
-    var cipherSuite: UShort = 1u
+    var cipherSuite: Int = 1
 
     @Param("1", "10", "100")
     var userCount: Int = 0
@@ -35,7 +35,7 @@ open class AddUser {
     @Setup(Level.Invocation)
     fun setup() {
         runBlocking {
-            val cipherSuite = CipherSuite.entries.first { it.value == cipherSuite }
+            val cipherSuite = CipherSuite.entries.first { it.value.toInt() == cipherSuite }
             val options = CcInitOptions(CcInitOptions.Mode.WithBasicCredential(cipherSuite))
             aliceCc = ccInit(options)
             conversationId = createConversation(aliceCc)

crypto-ffi/bindings/jvm/src/jmh/kotlin/com/wire/benchmark/CreateMessage.kt

@@ -23,7 +23,7 @@ open class CreateMessage {
         "5",
         "7"
     )
-    var cipherSuite: UShort = 1u
+    var cipherSuite: Int = 1
 
     @Param("1", "10", "100")
     var messageCount: Int = 0
@@ -37,7 +37,7 @@ open class CreateMessage {
 
     @Setup(Level.Iteration)
     fun setup() = runBlocking {
-        val cipherSuite = CipherSuite.entries.first { it.value == cipherSuite }
+        val cipherSuite = CipherSuite.entries.first { it.value.toInt() == cipherSuite }
         cc = ccInit(CcInitOptions(CcInitOptions.Mode.WithBasicCredential(cipherSuite)))
         conversationId = createConversation(cc)
         messages = List(messageCount) {

crypto-ffi/bindings/jvm/src/jmh/kotlin/com/wire/benchmark/JoinGroup.kt

@@ -21,7 +21,7 @@ open class JoinGroup {
         "5",
         "7"
     )
-    var cipherSuite: UShort = 1u
+    var cipherSuite: Int = 1
 
     @Param("1", "10", "100")
     var userCount: Int = 0
@@ -33,7 +33,7 @@ open class JoinGroup {
     @Setup(Level.Invocation)
     fun setup() {
         runBlocking {
-            val cipherSuite = CipherSuite.entries.first { it.value == cipherSuite }
+            val cipherSuite = CipherSuite.entries.first { it.value.toInt() == cipherSuite }
             val options = CcInitOptions(CcInitOptions.Mode.WithBasicCredential(cipherSuite))
             val aliceCc = ccInit(options)
             conversationId = createConversation(aliceCc)

crypto-ffi/bindings/jvm/src/jmh/kotlin/com/wire/benchmark/ProcessMessage.kt

@@ -24,7 +24,7 @@ open class ProcessMessage {
         "5",
         "7"
     )
-    var cipherSuite: UShort = 1u
+    var cipherSuite: Int = 1
 
     @Param("1", "10", "100")
     var messageCount: Int = 0
@@ -39,7 +39,7 @@ open class ProcessMessage {
 
     @Setup(Level.Invocation)
     fun setup() = runBlocking {
-        val cipherSuite = CipherSuite.entries.first { it.value == cipherSuite }
+        val cipherSuite = CipherSuite.entries.first { it.value.toInt() == cipherSuite }
         val options = CcInitOptions.Mode.WithBasicCredential(cipherSuite)
         val aliceCc = ccInit(CcInitOptions(options))
         conversationId = createConversation(aliceCc)

crypto-ffi/bindings/jvm/src/jmh/kotlin/com/wire/benchmark/RemoveUser.kt

@@ -23,7 +23,7 @@ open class RemoveUser {
         "5",
         "7"
     )
-    var cipherSuite: UShort = 1u
+    var cipherSuite: Int = 1
 
     @Param("1", "10", "100")
     var userCount: Int = 0
@@ -35,7 +35,7 @@ open class RemoveUser {
     @Setup(Level.Invocation)
     fun setup() {
         runBlocking {
-            val cipherSuite = CipherSuite.entries.first { it.value == cipherSuite }
+            val cipherSuite = CipherSuite.entries.first { it.value.toInt() == cipherSuite }
             aliceCc = ccInit(CcInitOptions(CcInitOptions.Mode.WithBasicCredential(cipherSuite)))
             conversationId = createConversation(aliceCc)
 

crypto-ffi/src/cipher_suite.rs

@@ -37,6 +37,39 @@ pub enum CipherSuite {
 
     /// DH KEM P384 | AES-GCM 256 | SHA2-384 | EcDSA P384
     MLS_256_DHKEMP384_AES256GCM_SHA384_P384 = 0x0007,
+
+    /// PQ: ML-KEM-768 + x25519 | AES-GCM 128 | SHA2-256 | Ed25519
+    MLS_128_MLKEM768X25519_AES128GCM_SHA256_Ed25519 = 0xF001,
+
+    /// PQ: ML-KEM-768 + x25519 | AES-GCM 256 | SHA2-384 | Ed25519
+    MLS_128_MLKEM768X25519_AES256GCM_SHA384_Ed25519 = 0xF002,
+
+    /// PQ: ML-KEM-768 + P256 | AES-GCM 128 | SHA2-256 | P256
+    MLS_128_MLKEM768P256_AES128GCM_SHA256_P256 = 0xF003,
+
+    /// PQ: ML-KEM-768 + P256 | AES-GCM 256 | SHA2-384 | P256
+    MLS_128_MLKEM768P256_AES256GCM_SHA384_P256 = 0xF004,
+
+    /// PQ: ML-KEM-1024 + P384 | AES-GCM 256 | SHA2-384 | P384
+    MLS_192_MLKEM1024P384_AES256GCM_SHA384_P384 = 0xF005,
+
+    /// PQ: ML-KEM-768 | AES-GCM 256 | SHA2-384 | P256
+    MLS_128_MLKEM768_AES256GCM_SHA384_P256 = 0xF006,
+
+    /// PQ: ML-KEM-1024 | AES-GCM 256 | SHA2-384 | P384
+    MLS_192_MLKEM1024_AES256GCM_SHA384_P384 = 0xF007,
+
+    /// PQ: ML-KEM-768 | AES-GCM 256 | SHA2-384 | ML-DSA-65
+    MLS_192_MLKEM768_AES256GCM_SHA384_MLDSA65 = 0xF008,
+
+    /// PQ: ML-KEM-1024 | AES-GCM 256 | SHA2-384 | ML-DSA-87
+    MLS_256_MLKEM1024_AES256GCM_SHA384_MLDSA87 = 0xF009,
+
+    /// PQ: ML-KEM-768 | AES-GCM 256 | SHA2-384 | Ed25519
+    MLS_128_MLKEM768_AES256GCM_SHA384_Ed25519 = 0xF00A,
+
+    /// PQ: ML-KEM-768 + x25519 | Chacha20Poly1305 | SHA2-384 | ML-DSA-44
+    MLS_128_MLKEM768X25519_CHACHA20POLY1305_SHA384_MLDSA44 = 0xF00B,
 }
 
 impl From<CipherSuite> for MlsCipherSuite {