add askarKeyFromKeyExchange and askarKeyConvert

Author: ssferraz

lib/askar/askar_wrapper.dart

@@ -336,22 +336,28 @@ AskarResult<Uint8List> askarKeyAeadRandomNonce(
   return AskarResult<Uint8List>(errorCode, value);
 }
 
-ErrorCode askarKeyConvert(
+AskarResult<LocalKeyHandle> askarKeyConvert(
   LocalKeyHandle handle,
-  String alg,
-  Pointer<NativeLocalKeyHandle> out,
+  KeyAlgorithm alg,
 ) {
-  final algPointer = alg.toNativeUtf8();
+  Pointer<NativeLocalKeyHandle> localKeyHandlePtr = calloc<NativeLocalKeyHandle>();
+
+  final algPointer = alg.value.toNativeUtf8();
 
   final result = nativeAskarKeyConvert(
     handle.toInt(),
     algPointer,
-    out,
+    localKeyHandlePtr,
   );
 
+  final errorCode = ErrorCode.fromInt(result);
+
+  final localKeyHandle = LocalKeyHandle.fromPointer(errorCode, localKeyHandlePtr);
+
   calloc.free(algPointer);
+  calloc.free(localKeyHandlePtr);
 
-  return ErrorCode.fromInt(result);
+  return AskarResult<LocalKeyHandle>(errorCode, localKeyHandle);
 }
 
 ErrorCode askarKeyCryptoBox(
@@ -640,24 +646,30 @@ AskarResult<LocalKeyHandle> askarKeyFromJwk(String jwk) {
   return AskarResult<LocalKeyHandle>(errorCode, value);
 }
 
-ErrorCode askarKeyFromKeyExchange(
-  String alg,
+AskarResult<LocalKeyHandle> askarKeyFromKeyExchange(
+  KeyAlgorithm alg,
   LocalKeyHandle skHandle,
   LocalKeyHandle pkHandle,
-  Pointer<NativeLocalKeyHandle> out,
 ) {
-  final algPointer = alg.toNativeUtf8();
+  Pointer<NativeLocalKeyHandle> localKeyHandlePtr = calloc<NativeLocalKeyHandle>();
+
+  final algPointer = alg.value.toNativeUtf8();
 
   final result = nativeAskarKeyFromKeyExchange(
     algPointer,
     skHandle.toInt(),
     pkHandle.toInt(),
-    out,
+    localKeyHandlePtr,
   );
 
+  final errorCode = ErrorCode.fromInt(result);
+
+  final localKeyHandle = LocalKeyHandle.fromPointer(errorCode, localKeyHandlePtr);
+
   calloc.free(algPointer);
+  calloc.free(localKeyHandlePtr);
 
-  return ErrorCode.fromInt(result);
+  return AskarResult<LocalKeyHandle>(errorCode, localKeyHandle);
 }
 
 AskarResult<LocalKeyHandle> askarKeyFromPublicBytes(

lib/askar/crypto/askar_key.dart

@@ -7,6 +7,7 @@ import 'package:import_so_libaskar/askar/enums/askar_key_algorithm.dart';
 import 'package:import_so_libaskar/askar/enums/askar_key_backend.dart';
 import 'package:import_so_libaskar/askar/enums/askar_signature_algorithm.dart';
 import 'package:import_so_libaskar/askar/exceptions/exceptions.dart';
+import 'package:import_so_libaskar/global.dart';
 
 class AskarKey {
   final LocalKeyHandle localKeyHandle;
@@ -63,17 +64,26 @@ class AskarKey {
     }
   }
 
-  // TODO
-  // AskarKey convertKey({required KeyAlgorithm algorithm}) {
-  //   return AskarKey(askar.keyConvert(localKeyHandle: handle, algorithm: algorithm));
-  // }
+  AskarKey convertKey({required KeyAlgorithm algorithm}) {
+    try {
+      return AskarKey(askarKeyConvert(localKeyHandle, algorithm).getValueOrException());
+    } catch (e) {
+      throw AskarKeyException('Failed to convert key from algorithm: $e');
+    }
+  }
 
-  // TODO
-  // AskarKey keyFromKeyExchange(
-  //     {required KeyAlgorithm algorithm, required AskarKey publicKey}) {
-  //   return AskarKey(askar.keyFromKeyExchange(
-  //       skHandle: handle, pkHandle: publicKey.handle, algorithm: algorithm));
-  // }
+  AskarKey keyFromKeyExchange(
+      {required KeyAlgorithm algorithm,
+      required AskarKey secretKey,
+      required AskarKey publicKey}) {
+    try {
+      return AskarKey(
+          askarKeyFromKeyExchange(algorithm, secretKey.handle, publicKey.handle)
+              .getValueOrException());
+    } catch (e) {
+      throw AskarKeyException('Failed to get key from key exchange: $e');
+    }
+  }
 
   LocalKeyHandle get handle => localKeyHandle;
 

test/askar_test.dart

@@ -176,7 +176,22 @@ void main() {
 
       final publicBytes = keyGetPublicBytesTest(localKeyHandle).value;
 
-      keyFromPublicBytesTest(algorithm, publicBytes);
+      keyFromPublicBytesTest(algorithm, publicBytes).value;
+
+      // Início do keyFromKeyExchangeTest
+      final convertedAlgorithm = KeyAlgorithm.x25519;
+      final convertedKeyHandle = keyConvertTest(localKeyHandle, convertedAlgorithm).value;
+
+      final convertedKeyGenerateResult = keyGenerateTest(convertedAlgorithm);
+      final newKeyHandle = convertedKeyGenerateResult.value;
+      keyGetAlgorithmTest(newKeyHandle, expected: convertedAlgorithm);
+
+      final exchangeAlgorithm = KeyAlgorithm.chacha20XC20P;
+      final exchangedKeyHandle =
+          keyFromKeyExchangeTest(exchangeAlgorithm, convertedKeyHandle, newKeyHandle)
+              .value;
+      keyGetAlgorithmTest(exchangedKeyHandle, expected: exchangeAlgorithm);
+      // Fim do keyFromKeyExchangeTest
 
       await sessionInsertKeyTest(
           sessionHandle, localKeyHandle, '${name}_1', metadata, tags);
@@ -445,6 +460,17 @@ void main() {
   });
 }
 
+AskarResult<LocalKeyHandle> keyConvertTest(
+    LocalKeyHandle handle, KeyAlgorithm algorithm) {
+  final result = askarKeyConvert(handle, algorithm);
+
+  printAskarResult('KeyConvertTest', result);
+
+  expect(result.errorCode, equals(ErrorCode.success));
+
+  return result;
+}
+
 AskarResult<AskarEncryptedBuffer> keyAeadEncryptTest(
     LocalKeyHandle handle, Uint8List message,
     {Uint8List? nonce, Uint8List? aad}) {
@@ -1063,6 +1089,20 @@ AskarResult<LocalKeyHandle> keyFromPublicBytesTest(
   return result;
 }
 
+AskarResult<LocalKeyHandle> keyFromKeyExchangeTest(
+  KeyAlgorithm algorithm,
+  LocalKeyHandle secretKeyHandle,
+  LocalKeyHandle publicKeyHandle,
+) {
+  final result = askarKeyFromKeyExchange(algorithm, secretKeyHandle, publicKeyHandle);
+  printAskarResult('KeyFromKeyExchange', result);
+
+  expect(result.errorCode, ErrorCode.success);
+  expect(result.value.toInt(), greaterThan(0));
+
+  return result;
+}
+
 Future<AskarCallbackBlankResult> sessionCloseTest(SessionHandle handle) async {
   final result = await askarSessionClose(handle, true);
 

todo.md

@@ -42,7 +42,7 @@
 
 - [x] askar_key_aead_random_nonce: (args_0: Buffer, args_1: Buffer) => number;
 
-- [ ] askar_key_convert: (args_0: Buffer, args_1: string, args_2: Buffer) => number;
+- [x] askar_key_convert: (args_0: Buffer, args_1: string, args_2: Buffer) => number;
 
 - [ ] askar_key_crypto_box: (args_0: Buffer, args_1: Buffer, args_2: Buffer, args_3: Buffer, args_4: Buffer) => number;
 
@@ -76,7 +76,7 @@
 
 - [x] askar_key_from_jwk: (args_0: Buffer, args_1: Buffer) => number;
 
-- [ ] askar_key_from_key_exchange: (args_0: string, args_1: Buffer, args_2: Buffer, args_3: Buffer) => number;
+- [x] askar_key_from_key_exchange: (args_0: string, args_1: Buffer, args_2: Buffer, args_3: Buffer) => number;
 
 - [ ] askar_key_from_public_bytes: (args_0: string, args_1: Buffer, args_2: Buffer) => number;