chore: update to ffi version 2

namib-project · Jan 9, 2023 · 420b6ea · 420b6ea
1 parent 953bac6
commit 420b6ea
Show file tree

Hide file tree

Showing 6 changed files with 365 additions and 344 deletions.
diff --git a/lib/src/client.dart b/lib/src/client.dart
@@ -23,8 +23,9 @@ import 'types.dart';
 import 'util.dart';
 
 int _handleWrite(Pointer<dtls_context_t> context, Pointer<session_t> session,
-    Pointer<ffi.Uint8> dataAddress, int dataLength) {
-  final data = dataAddress.asTypedList(dataLength).buffer.asUint8List();
+    Pointer<ffi.UnsignedChar> dataAddress, int dataLength) {
+  final data =
+      dataAddress.cast<Uint8>().asTypedList(dataLength).buffer.asUint8List();
   final address = addressFromSession(session);
   final port = portFromSession(session);
 
@@ -33,14 +34,14 @@ int _handleWrite(Pointer<dtls_context_t> context, Pointer<session_t> session,
 }
 
 int _handleRead(Pointer<dtls_context_t> context, Pointer<session_t> session,
-    Pointer<ffi.Uint8> dataAddress, int dataLength) {
+    Pointer<ffi.UnsignedChar> dataAddress, int dataLength) {
   final connection = DtlsClientConnection._connections[context.address];
 
   if (connection == null) {
     return errorCode;
   }
 
-  final data = dataAddress.asTypedList(dataLength);
+  final data = dataAddress.cast<Uint8>().asTypedList(dataLength);
   final address = addressFromSession(session);
   final port = portFromSession(session);
 
@@ -67,9 +68,9 @@ int _retrievePskInfo(
   Pointer<dtls_context_t> context,
   Pointer<session_t> session,
   int type,
-  Pointer<ffi.Uint8> id,
+  Pointer<ffi.UnsignedChar> id,
   int idLen,
-  Pointer<ffi.Uint8> result,
+  Pointer<ffi.UnsignedChar> result,
   int resultLength,
 ) {
   final connection = DtlsClientConnection._connections[context.address];
@@ -85,7 +86,7 @@ int _retrievePskInfo(
     throw StateError("Expected a defined pskCallback.");
   }
 
-  final idBytes = id.asTypedList(idLen);
+  final idBytes = id.cast<Uint8>().asTypedList(idLen);
 
   switch (type) {
     case dtls_credentials_type_t.DTLS_PSK_IDENTITY:
@@ -97,7 +98,7 @@ int _retrievePskInfo(
       }
 
       final identityBytes = identity;
-      result.asTypedList(resultLength).setAll(0, identityBytes);
+      result.cast<Uint8>().asTypedList(resultLength).setAll(0, identityBytes);
       connection._pskCredentials = pskCredentials;
       return identityBytes.lengthInBytes;
     case dtls_credentials_type_t.DTLS_PSK_KEY:
@@ -111,7 +112,7 @@ int _retrievePskInfo(
           return createFatalError(dtls_alert_t.DTLS_ALERT_ILLEGAL_PARAMETER);
         }
 
-        result.asTypedList(resultLength).setAll(0, psk);
+        result.cast<Uint8>().asTypedList(resultLength).setAll(0, psk);
         return psk.lengthInBytes;
       }
     case dtls_credentials_type_t.DTLS_PSK_HINT:
@@ -140,8 +141,8 @@ int _retrieveEcdsaInfo(
 int _verifyEcdsaKey(
     ffi.Pointer<dtls_context_t> context,
     ffi.Pointer<session_t> session,
-    ffi.Pointer<ffi.Uint8> publicKeyX,
-    ffi.Pointer<ffi.Uint8> publicKeyY,
+    ffi.Pointer<ffi.UnsignedChar> publicKeyX,
+    ffi.Pointer<ffi.UnsignedChar> publicKeyY,
     int keySize) {
   return success;
 }
@@ -371,7 +372,8 @@ class DtlsClient {
   int _send(List<int> data, Pointer<dtls_context_t> context,
       Pointer<session_t> session) {
     buffer.asTypedList(data.length).setAll(0, data);
-    final result = _tinyDtls.dtls_write(context, session, buffer, data.length);
+    final result =
+        _tinyDtls.dtls_write(context, session, buffer.cast(), data.length);
 
     if (result < 0) {
       throw DtlsException("Error sending DTLS message");
@@ -383,7 +385,7 @@ class DtlsClient {
   void _receive(Uint8List data, Pointer<dtls_context_t> context,
       Pointer<session_t> session) {
     buffer.asTypedList(data.length).setAll(0, data);
-    _tinyDtls.dtls_handle_message(context, session, buffer, data.length);
+    _tinyDtls.dtls_handle_message(context, session, buffer.cast(), data.length);
   }
 
   /// Closes this [DtlsClient].

diff --git a/lib/src/ecdsa_keys.dart b/lib/src/ecdsa_keys.dart
@@ -53,7 +53,7 @@ class KeyComponent {
     }
   }
 
-  Pointer<Uint8> _createKeyPointer() {
+  Pointer<UnsignedChar> _createKeyPointer() {
     final keySize = _ecdsaCurve.byteLength;
     final pointer = malloc<Uint8>(keySize)
       ..asTypedList(keySize).setAll(0, byteArray);