Fix building livekit-ffi

Author: onestacked

livekit-ffi/protocol/e2ee.proto

@@ -38,6 +38,13 @@ message KeyProviderOptions {
     required int32 ratchet_window_size = 2;
     required bytes ratchet_salt = 3;
     required int32 failure_tolerance = 4; // -1 = no tolerance
+    required int32 key_ring_size = 5; 
+    required KeyDerivationFunction key_derivation_function = 6;
+}
+
+enum KeyDerivationFunction {
+    PBKDF2 = 0;
+    HKDF = 1;
 }
 
 message E2eeOptions {

livekit-ffi/src/conversion/room.rs

@@ -15,7 +15,7 @@
 use crate::{proto, server::room::FfiRoom};
 use livekit::{
     e2ee::{
-        key_provider::{KeyProvider, KeyProviderOptions},
+        key_provider::{KeyDerivationFunction, KeyProvider, KeyProviderOptions},
         E2eeOptions, EncryptionType,
     },
     options::{AudioEncoding, TrackPublishOptions, VideoEncoding},
@@ -108,10 +108,22 @@ impl From<DisconnectReason> for proto::DisconnectReason {
 
 impl From<proto::KeyProviderOptions> for KeyProviderOptions {
     fn from(value: proto::KeyProviderOptions) -> Self {
+        let key_derivation_function = value.key_derivation_function().into();
         Self {
             ratchet_window_size: value.ratchet_window_size,
             ratchet_salt: value.ratchet_salt,
             failure_tolerance: value.failure_tolerance,
+            key_ring_size: value.key_ring_size,
+            key_derivation_function,
+        }
+    }
+}
+
+impl From<proto::KeyDerivationFunction> for KeyDerivationFunction {
+    fn from(value: proto::KeyDerivationFunction) -> Self {
+        match value {
+            proto::KeyDerivationFunction::Pbkdf2 => KeyDerivationFunction::PBKDF2,
+            proto::KeyDerivationFunction::Hkdf => KeyDerivationFunction::HKDF,
         }
     }
 }

livekit/src/room/e2ee/key_provider.rs

@@ -27,7 +27,6 @@ const DEFAULT_FAILURE_TOLERANCE: i32 = -1; // no tolerance by default
 const DEFAULT_KEY_RING_SIZE: i32 = 16;
 
 #[derive(Clone)]
-#[non_exhaustive]
 pub struct KeyProviderOptions {
     pub ratchet_window_size: i32,
     pub ratchet_salt: Vec<u8>,