react-native-quick-crypto 0.7.9 → 0.7.11

package/android/CMakeLists.txt

@@ -1,87 +1,84 @@
 project(ReactNativeQuickCrypto)
-cmake_minimum_required(VERSION 3.10.2)
+cmake_minimum_required(VERSION 3.9.0)
 
 set(PACKAGE_NAME "reactnativequickcrypto")
 set(BUILD_DIR ${CMAKE_SOURCE_DIR}/build)
 set(CMAKE_VERBOSE_MAKEFILE ON)
 set(CMAKE_CXX_STANDARD 17)
 
-# set (CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -g")
-# set (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -g")
-
-# Third party libraries (Prefabs)
-find_package(fbjni REQUIRED CONFIG)
-find_package(ReactAndroid REQUIRED CONFIG)
-find_package(openssl REQUIRED CONFIG)
-find_library(LOG_LIB log)
-
+# Define C++ library and add all sources
 add_library(
-  ${PACKAGE_NAME}
-  SHARED
-  "src/main/cpp/cpp-adapter.cpp"
-  "../cpp/MGLQuickCryptoHostObject.cpp"
-  "../cpp/JSIUtils/MGLTypedArray.cpp"
-  "../cpp/Utils/MGLDispatchQueue.cpp"
-  "../cpp/JSIUtils/MGLThreadAwareHostObject.cpp"
-  "../cpp/JSIUtils/MGLSmartHostObject.cpp"
-  "../cpp/HMAC/MGLHmacInstaller.cpp"
-  "../cpp/HMAC/MGLHmacHostObject.cpp"
-  "../cpp/fastpbkdf2/MGLPbkdf2HostObject.cpp"
-  "../cpp/fastpbkdf2/fastpbkdf2.c"
-  "../cpp/Random/MGLRandomHostObject.cpp"
-  "../cpp/Hash/MGLHashInstaller.cpp"
-  "../cpp/Hash/MGLHashHostObject.cpp"
-  "../cpp/Cipher/MGLCipherHostObject.cpp"
-  "../cpp/Cipher/MGLCreateCipherInstaller.cpp"
-  "../cpp/Cipher/MGLCreateDecipherInstaller.cpp"
-  "../cpp/MGLKeys.cpp"
-  "../cpp/Utils/MGLUtils.cpp"
-  "../cpp/Cipher/MGLRsa.cpp"
-  "../cpp/Cipher/MGLGenerateKeyPairInstaller.cpp"
-  "../cpp/Cipher/MGLGenerateKeyPairSyncInstaller.cpp"
-  "../cpp/Sig/MGLSignInstaller.cpp"
-  "../cpp/Sig/MGLVerifyInstaller.cpp"
-  "../cpp/Sig/MGLSignHostObjects.cpp"
-  "../cpp/webcrypto/MGLWebCrypto.cpp"
-  "../cpp/webcrypto/crypto_aes.cpp"
-  "../cpp/webcrypto/crypto_ec.cpp"
-  "../cpp/webcrypto/crypto_keygen.cpp"
+  ${PACKAGE_NAME} SHARED
+  src/main/cpp/cpp-adapter.cpp
+  ../cpp/MGLQuickCryptoHostObject.cpp
+  ../cpp/JSIUtils/MGLTypedArray.cpp
+  ../cpp/Utils/MGLDispatchQueue.cpp
+  ../cpp/JSIUtils/MGLThreadAwareHostObject.cpp
+  ../cpp/JSIUtils/MGLSmartHostObject.cpp
+  ../cpp/HMAC/MGLHmacInstaller.cpp
+  ../cpp/HMAC/MGLHmacHostObject.cpp
+  ../cpp/fastpbkdf2/MGLPbkdf2HostObject.cpp
+  ../cpp/fastpbkdf2/fastpbkdf2.c
+  ../cpp/Random/MGLRandomHostObject.cpp
+  ../cpp/Hash/MGLHashInstaller.cpp
+  ../cpp/Hash/MGLHashHostObject.cpp
+  ../cpp/Cipher/MGLCipherHostObject.cpp
+  ../cpp/Cipher/MGLCreateCipherInstaller.cpp
+  ../cpp/Cipher/MGLCreateDecipherInstaller.cpp
+  ../cpp/MGLKeys.cpp
+  ../cpp/Utils/MGLUtils.cpp
+  ../cpp/Cipher/MGLRsa.cpp
+  ../cpp/Cipher/MGLGenerateKeyPairInstaller.cpp
+  ../cpp/Cipher/MGLGenerateKeyPairSyncInstaller.cpp
+  ../cpp/Sig/MGLSignInstaller.cpp
+  ../cpp/Sig/MGLVerifyInstaller.cpp
+  ../cpp/Sig/MGLSignHostObjects.cpp
+  ../cpp/webcrypto/MGLWebCrypto.cpp
+  ../cpp/webcrypto/crypto_aes.cpp
+  ../cpp/webcrypto/crypto_ec.cpp
+  ../cpp/webcrypto/crypto_keygen.cpp
 )
 
-target_include_directories(
-  ${PACKAGE_NAME}
-  PRIVATE
-  "../cpp"
-  "src/main/cpp"
-  "${NODE_MODULES_DIR}/react-native/ReactCommon"
-  "${NODE_MODULES_DIR}/react-native/ReactCommon/callinvoker"
-  "${NODE_MODULES_DIR}/react-native/ReactAndroid/src/main/jni/react/turbomodule"
-  "${NODE_MODULES_DIR}/react-native/ReactCommon/jsi"
-  "${NODE_MODULES_DIR}/react-native/ReactCommon/turbomodule/core"
-  "${NODE_MODULES_DIR}/react-native/ReactCommon/react/nativemodule/core"
+# local includes
+include_directories(
+  src/main/cpp
+  ../cpp
+  ../cpp/Cipher
+  ../cpp/fastpbkdf2
+  ../cpp/Hash
+  ../cpp/HMAC
+  ../cpp/JSIUtils
+  ../cpp/Random
+  ../cpp/Sig
+  ../cpp/Utils
+  ../cpp/webcrypto
 )
 
-#file(GLOB LIBRN_DIR "${BUILD_DIR}/react-native-0*/jni/${ANDROID_ABI}")
+# Third party libraries (Prefabs)
+find_library(LOG_LIB log)
+find_package(openssl REQUIRED CONFIG)
+find_package(fbjni REQUIRED CONFIG)
+find_package(ReactAndroid REQUIRED CONFIG)
+
 
 target_link_libraries(
   ${PACKAGE_NAME}
-  fbjni::fbjni                           # <-- fbjni
-  ${LOG_LIB}                             # <-- Logcat logger
-  ReactAndroid::jsi                      # <-- RN: JSI
-  android                                # <-- Android JNI core
-  openssl::crypto                        # <-- OpenSSL (Crypto)
+  ${LOG_LIB}                                  # <-- Logcat logger
+  android                                     # <-- Android JNI core
+  fbjni::fbjni                                # <-- Facebook C++ JNI helpers
+  ReactAndroid::jsi                           # <-- RN: JSI
+  openssl::crypto                             # <-- OpenSSL (Crypto)
 )
 
 if(ReactAndroid_VERSION_MINOR GREATER_EQUAL 76)
   target_link_libraries(
     ${PACKAGE_NAME}
-    ReactAndroid::reactnative             # <-- RN: Native Modules umbrella prefab
+    ReactAndroid::reactnative                 # <-- RN: Native Modules umbrella prefab
   )
 else()
   target_link_libraries(
     ${PACKAGE_NAME}
-    ReactAndroid::turbomodulejsijni
-    ReactAndroid::reactnativejni           # <-- RN: React Native JNI bindings
-    ReactAndroid::react_nativemodule_core  # <-- RN: React Native native module core
-  )
+    ReactAndroid::react_nativemodule_core     # <-- RN: TurboModules Core
+    ReactAndroid::turbomodulejsijni           # <-- RN: TurboModules utils (e.g. CallInvokerHolder)
+)
 endif()

package/android/build.gradle

@@ -7,15 +7,13 @@ def agpVersionMinor = agpVersion.tokenize('.')[1].toInteger()
 
 buildscript {
   repositories {
-    maven {
-      url "https://plugins.gradle.org/m2/"
-    }
-    mavenCentral()
     google()
+    mavenCentral()
   }
 
   dependencies {
-    classpath("com.android.tools.build:gradle:8.3.1")
+    classpath("com.android.tools.build:gradle:8.7.3")
+    classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${kotlinVersion}"
   }
 }
 
@@ -34,10 +32,12 @@ def resolveBuildType() {
     return tskReqStr.contains('Release') ? 'release' : 'debug'
 }
 
+apply plugin: 'com.android.library'
+apply plugin: "org.jetbrains.kotlin.android"
+
 if (isNewArchitectureEnabled()) {
   apply plugin: "com.facebook.react"
 }
-apply plugin: 'com.android.library'
 
 def safeExtGet(prop, fallback) {
   rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
@@ -112,7 +112,7 @@ android {
     externalNativeBuild {
       cmake {
         cppFlags "-O2 -frtti -fexceptions -Wall -Wno-unused-variable -fstack-protector-all -DANDROID"
-        arguments "-DANDROID_STL=c++_shared", "-DNODE_MODULES_DIR=${nodeModules}"
+        arguments "-DANDROID_STL=c++_shared"
         abiFilters (*reactNativeArchitectures())
       }
     }
@@ -171,8 +171,9 @@ repositories {
 dependencies {
   //noinspection GradleDynamicVersion
   implementation "com.facebook.react:react-android:+"
-  // https://mvnrepository.com/artifact/com.android.ndk.thirdparty/openssl
-  implementation 'com.android.ndk.thirdparty:openssl:1.1.1q-beta-1'
+
+  // Add a dependency on OpenSSL
+  implementation 'io.github.ronickg:openssl:3.3.2'
 }
 
 // Resolves "LOCAL_SRC_FILES points to a missing file, Check that libfb.so exists or that its path is correct".

package/android/src/main/cpp/cpp-adapter.cpp

@@ -2,8 +2,10 @@
 #include <fbjni/fbjni.h>
 #include <jni.h>
 #include <jsi/jsi.h>
+#include <memory>
 
 #include "MGLQuickCryptoHostObject.h"
+#include "JSIUtils/MGLTypedArray.h"
 
 using namespace facebook;
 
@@ -28,6 +30,13 @@ class CryptoCppAdapter : public jni::HybridClass<CryptoCppAdapter> {
     auto object = jsi::Object::createFromHostObject(runtime, hostObject);
     runtime.global().setProperty(runtime, "__QuickCryptoProxy",
                                  std::move(object));
+    // Adds the PropNameIDCache object to the Runtime. If the Runtime gets destroyed, the Object gets destroyed and the cache gets invalidated.
+    auto propNameIdCache = std::make_shared<InvalidateCacheOnDestroy>(runtime);
+    runtime.global().setProperty(
+      runtime,
+      "rnqcArrayBufferPropNameIdCache",
+      jsi::Object::createFromHostObject(runtime, propNameIdCache)
+    );
   }
 
   void nativeInstall(

package/cpp/JSIUtils/MGLTypedArray.cpp

@@ -10,6 +10,8 @@
 
 #include <algorithm>
 #include <memory>
+#include <utility>
+#include <vector>
 #include <string>
 #include <unordered_map>
 
@@ -40,33 +42,37 @@ enum class Prop {
 class PropNameIDCache {
  public:
   const jsi::PropNameID &get(jsi::Runtime &runtime, Prop prop) {
-    if (!this->props[prop]) {
-      this->props[prop] =
-          std::make_unique<jsi::PropNameID>(createProp(runtime, prop));
+    auto key = reinterpret_cast<uintptr_t>(&runtime);
+    if (this->props.find(key) == this->props.end()) {
+      this->props[key] = std::unordered_map<Prop, std::unique_ptr<jsi::PropNameID>>();
     }
-    return *(this->props[prop]);
+    if (!this->props[key][prop]) {
+      this->props[key][prop] = std::make_unique<jsi::PropNameID>(createProp(runtime, prop));
+    }
+    return *(this->props[key][prop]);
   }
 
-  const jsi::PropNameID &getConstructorNameProp(jsi::Runtime &runtime,
-                                                MGLTypedArrayKind kind);
+  const jsi::PropNameID &getConstructorNameProp(jsi::Runtime &runtime, MGLTypedArrayKind kind);
 
-  void invalidate() {
-    /** This call (and attempts to use props.clear()) crash 💥 when the
-     *  JSI runtime has already been destroyed.  So we are commenting it out
-     *  and waiting for Nitro and 1.0 to fix this the proper way.
-     */
-    //props.erase(props.begin(), props.end());
+  void invalidate(uintptr_t key) {
+    if (props.find(key) != props.end()) {
+      props[key].clear();
+    }
   }
-
  private:
-  std::unordered_map<Prop, std::unique_ptr<jsi::PropNameID>> props;
+  std::unordered_map<uintptr_t, std::unordered_map<Prop, std::unique_ptr<jsi::PropNameID>>> props;
 
   jsi::PropNameID createProp(jsi::Runtime &runtime, Prop prop);
 };
 
 PropNameIDCache propNameIDCache;
 
-void invalidateJsiPropNameIDCache() { propNameIDCache.invalidate(); }
+InvalidateCacheOnDestroy::InvalidateCacheOnDestroy(jsi::Runtime &runtime) {
+  key = reinterpret_cast<uintptr_t>(&runtime);
+}
+InvalidateCacheOnDestroy::~InvalidateCacheOnDestroy() {
+  propNameIDCache.invalidate(key);
+}
 
 MGLTypedArrayKind getTypedArrayKindForName(const std::string &name);
 
@@ -75,8 +81,9 @@ MGLTypedArrayBase::MGLTypedArrayBase(jsi::Runtime &runtime, size_t size,
     : MGLTypedArrayBase(
           runtime,
           runtime.global()
-              .getProperty(runtime, propNameIDCache.getConstructorNameProp(
-                                        runtime, kind))
+              .getProperty(
+                runtime,
+                propNameIDCache.getConstructorNameProp(runtime, kind))
               .asObject(runtime)
               .asFunction(runtime)
               .callAsConstructor(runtime, {static_cast<double>(size)})
@@ -236,6 +243,20 @@ void MGLTypedArray<T>::update(jsi::Runtime &runtime,
             reinterpret_cast<ContentType<T> *>(rawData));
 }
 
+template <MGLTypedArrayKind T>
+void MGLTypedArray<T>::updateUnsafe(jsi::Runtime &runtime, ContentType<T> *data, size_t length) {
+    if (length != size(runtime)) {
+    throw jsi::JSError(runtime, "TypedArray can only be updated with an array of the same size");
+  }
+  uint8_t *rawData = getBuffer(runtime).data(runtime) + byteOffset(runtime);
+  memcpy(rawData, data, length);
+}
+
+template <MGLTypedArrayKind T>
+uint8_t* MGLTypedArray<T>::data(jsi::Runtime &runtime) {
+  return getBuffer(runtime).data(runtime) + byteOffset(runtime);
+}
+
 const jsi::PropNameID &PropNameIDCache::getConstructorNameProp(
     jsi::Runtime &runtime, MGLTypedArrayKind kind) {
   switch (kind) {

package/cpp/JSIUtils/MGLTypedArray.h

@@ -69,7 +69,24 @@ struct typedArrayTypeMap<MGLTypedArrayKind::Float64Array> {
   typedef double type;
 };
 
-void invalidateJsiPropNameIDCache();
+// Instance of this class will invalidate PropNameIDCache when destructor is called.
+// Attach this object to global in specific jsi::Runtime to make sure lifecycle of
+// the cache object is connected to the lifecycle of the js runtime
+class InvalidateCacheOnDestroy : public jsi::HostObject {
+ public:
+  explicit InvalidateCacheOnDestroy(jsi::Runtime &runtime);
+  virtual ~InvalidateCacheOnDestroy();
+  virtual jsi::Value get(jsi::Runtime &, const jsi::PropNameID &name) {
+    return jsi::Value::null();
+  }
+  virtual void set(jsi::Runtime &, const jsi::PropNameID &name, const jsi::Value &value) {}
+  virtual std::vector<jsi::PropNameID> getPropertyNames(jsi::Runtime &rt) {
+    return {};
+  }
+
+ private:
+  uintptr_t key;
+};
 
 class MGLTypedArrayBase : public jsi::Object {
  public:
@@ -126,6 +143,8 @@ class MGLTypedArray : public MGLTypedArrayBase {
 
   std::vector<ContentType<T>> toVector(jsi::Runtime &runtime);
   void update(jsi::Runtime &runtime, const std::vector<ContentType<T>> &data);
+  void updateUnsafe(jsi::Runtime &runtime, ContentType<T> *data, size_t length);
+  uint8_t* data(jsi::Runtime &runtime);
 };
 
 template <MGLTypedArrayKind T>

package/cpp/MGLQuickCryptoHostObject.h

@@ -22,7 +22,7 @@ class JSI_EXPORT MGLQuickCryptoHostObject : public MGLSmartHostObject {
       std::shared_ptr<react::CallInvoker> jsCallInvoker,
       std::shared_ptr<DispatchQueue::dispatch_queue> workerQueue);
 
-  virtual ~MGLQuickCryptoHostObject() { invalidateJsiPropNameIDCache(); }
+  virtual ~MGLQuickCryptoHostObject() {}
 };
 
 }  // namespace margelo

package/ios/QuickCrypto.xcodeproj/project.xcworkspace/contents.xcworkspacedata

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Workspace
+   version = "1.0">
+   <FileRef
+      location = "self:">
+   </FileRef>
+</Workspace>

package/ios/QuickCrypto.xcodeproj/xcuserdata/brad.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>SchemeUserState</key>
+	<dict>
+		<key>QuickCrypto.xcscheme_^#shared#^_</key>
+		<dict>
+			<key>orderHint</key>
+			<integer>0</integer>
+		</dict>
+	</dict>
+</dict>
+</plist>

package/ios/QuickCryptoModule.mm

@@ -6,6 +6,7 @@
 #import <jsi/jsi.h>
 
 #import "../cpp/MGLQuickCryptoHostObject.h"
+#import "../cpp/JSIUtils/MGLTypedArray.h"
 
 @implementation QuickCryptoModule
 
@@ -40,6 +41,15 @@ RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(install) {
   auto object = jsi::Object::createFromHostObject(runtime, hostObject);
   runtime.global().setProperty(runtime, "__QuickCryptoProxy", std::move(object));
 
+  // Adds the PropNameIDCache object to the Runtime. If the Runtime gets
+  // destroyed, the Object gets destroyed and the cache gets invalidated.
+  auto propNameIdCache = std::make_shared<InvalidateCacheOnDestroy>(runtime);
+  runtime.global().setProperty(
+    runtime,
+    "rnqcArrayBufferPropNameIdCache",
+    jsi::Object::createFromHostObject(runtime, propNameIdCache)
+  );
+
   NSLog(@"Successfully installed JSI bindings for react-native-quick-crypto!");
   return @true;
 }

package/lib/commonjs/Algorithms.js

@@ -0,0 +1,224 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.normalizeAlgorithm = void 0;
+const kSupportedAlgorithms = {
+  digest: {
+    'SHA-1': null,
+    'SHA-256': null,
+    'SHA-384': null,
+    'SHA-512': null
+  },
+  generateKey: {
+    'RSASSA-PKCS1-v1_5': 'RsaHashedKeyGenParams',
+    'RSA-PSS': 'RsaHashedKeyGenParams',
+    'RSA-OAEP': 'RsaHashedKeyGenParams',
+    ECDSA: 'EcKeyGenParams',
+    ECDH: 'EcKeyGenParams',
+    'AES-CTR': 'AesKeyGenParams',
+    'AES-CBC': 'AesKeyGenParams',
+    'AES-GCM': 'AesKeyGenParams',
+    'AES-KW': 'AesKeyGenParams',
+    HMAC: 'HmacKeyGenParams',
+    X25519: null,
+    Ed25519: null,
+    X448: null,
+    Ed448: null
+  },
+  sign: {
+    'RSASSA-PKCS1-v1_5': null,
+    'RSA-PSS': 'RsaPssParams',
+    ECDSA: 'EcdsaParams',
+    HMAC: null,
+    Ed25519: null,
+    Ed448: 'Ed448Params'
+  },
+  verify: {
+    'RSASSA-PKCS1-v1_5': null,
+    'RSA-PSS': 'RsaPssParams',
+    ECDSA: 'EcdsaParams',
+    HMAC: null,
+    Ed25519: null,
+    Ed448: 'Ed448Params'
+  },
+  importKey: {
+    'RSASSA-PKCS1-v1_5': 'RsaHashedImportParams',
+    'RSA-PSS': 'RsaHashedImportParams',
+    'RSA-OAEP': 'RsaHashedImportParams',
+    ECDSA: 'EcKeyImportParams',
+    ECDH: 'EcKeyImportParams',
+    HMAC: 'HmacImportParams',
+    HKDF: null,
+    PBKDF2: null,
+    'AES-CTR': null,
+    'AES-CBC': null,
+    'AES-GCM': null,
+    'AES-KW': null,
+    Ed25519: null,
+    X25519: null,
+    Ed448: null,
+    X448: null
+  },
+  deriveBits: {
+    HKDF: 'HkdfParams',
+    PBKDF2: 'Pbkdf2Params',
+    ECDH: 'EcdhKeyDeriveParams',
+    X25519: 'EcdhKeyDeriveParams',
+    X448: 'EcdhKeyDeriveParams'
+  },
+  encrypt: {
+    'RSA-OAEP': 'RsaOaepParams',
+    'AES-CBC': 'AesCbcParams',
+    'AES-GCM': 'AesGcmParams',
+    'AES-CTR': 'AesCtrParams'
+  },
+  decrypt: {
+    'RSA-OAEP': 'RsaOaepParams',
+    'AES-CBC': 'AesCbcParams',
+    'AES-GCM': 'AesGcmParams',
+    'AES-CTR': 'AesCtrParams'
+  },
+  'get key length': {
+    'AES-CBC': 'AesDerivedKeyParams',
+    'AES-CTR': 'AesDerivedKeyParams',
+    'AES-GCM': 'AesDerivedKeyParams',
+    'AES-KW': 'AesDerivedKeyParams',
+    HMAC: 'HmacImportParams',
+    HKDF: null,
+    PBKDF2: null
+  },
+  wrapKey: {
+    'AES-KW': null
+  },
+  unwrapKey: {
+    'AES-KW': null
+  }
+};
+const simpleAlgorithmDictionaries = {
+  AesGcmParams: {
+    iv: 'BufferSource',
+    additionalData: 'BufferSource'
+  },
+  RsaHashedKeyGenParams: {
+    hash: 'HashAlgorithmIdentifier'
+  },
+  EcKeyGenParams: {},
+  HmacKeyGenParams: {
+    hash: 'HashAlgorithmIdentifier'
+  },
+  RsaPssParams: {},
+  EcdsaParams: {
+    hash: 'HashAlgorithmIdentifier'
+  },
+  HmacImportParams: {
+    hash: 'HashAlgorithmIdentifier'
+  },
+  HkdfParams: {
+    hash: 'HashAlgorithmIdentifier',
+    salt: 'BufferSource',
+    info: 'BufferSource'
+  },
+  Ed448Params: {
+    context: 'BufferSource'
+  },
+  Pbkdf2Params: {
+    hash: 'HashAlgorithmIdentifier',
+    salt: 'BufferSource'
+  },
+  RsaOaepParams: {
+    label: 'BufferSource'
+  },
+  RsaHashedImportParams: {
+    hash: 'HashAlgorithmIdentifier'
+  },
+  EcKeyImportParams: {}
+};
+
+// https://w3c.github.io/webcrypto/#algorithm-normalization-normalize-an-algorithm
+// adapted for Node.js from Deno's implementation
+// https://github.com/denoland/deno/blob/v1.29.1/ext/crypto/00_crypto.js#L195
+const normalizeAlgorithm = (algorithm, op) => {
+  if (typeof algorithm === 'string') {
+    return normalizeAlgorithm({
+      name: algorithm
+    }, op);
+  }
+
+  // 1.
+  const registeredAlgorithms = kSupportedAlgorithms[op];
+  // 2. 3.
+  // commented, because typescript takes care of this for us 🤞👀
+  // const initialAlg = webidl.converters.Algorithm(algorithm, {
+  //   prefix: 'Failed to normalize algorithm',
+  //   context: 'passed algorithm',
+  // });
+
+  // 4.
+  let algName = algorithm.name;
+  if (algName === undefined) return {
+    name: 'unknown'
+  };
+
+  // 5.
+  let desiredType;
+  for (const key in registeredAlgorithms) {
+    if (!Object.prototype.hasOwnProperty.call(registeredAlgorithms, key)) {
+      continue;
+    }
+    if (key.toUpperCase() === algName.toUpperCase()) {
+      algName = key;
+      desiredType = registeredAlgorithms[algName];
+    }
+  }
+  if (desiredType === undefined) throw new Error(`Unrecognized algorithm name: ${algName}`);
+
+  // Fast path everything below if the registered dictionary is null
+  if (desiredType === null) return {
+    name: algName
+  };
+
+  // 6.
+  const normalizedAlgorithm = algorithm;
+  // TODO: implement this?  Maybe via typescript?
+  // webidl.converters[desiredType](algorithm, {
+  //   prefix: 'Failed to normalize algorithm',
+  //   context: 'passed algorithm',
+  // });
+  // 7.
+  normalizedAlgorithm.name = algName;
+
+  // 9.
+  const dict = simpleAlgorithmDictionaries[desiredType];
+  // 10.
+  const dictKeys = dict ? Object.keys(dict) : [];
+  for (let i = 0; i < dictKeys.length; i++) {
+    const member = dictKeys[i] || '';
+    if (!Object.prototype.hasOwnProperty.call(dict, member)) continue;
+    // TODO: implement this?  Maybe via typescript?
+    // const idlType = dict[member];
+    // const idlValue = normalizedAlgorithm[member];
+    // 3.
+    // if (idlType === 'BufferSource' && idlValue) {
+    //   const isView = ArrayBufferIsView(idlValue);
+    //   normalizedAlgorithm[member] = TypedArrayPrototypeSlice(
+    //     new Uint8Array(
+    //       isView ? getDataViewOrTypedArrayBuffer(idlValue) : idlValue,
+    //       isView ? getDataViewOrTypedArrayByteOffset(idlValue) : 0,
+    //       isView
+    //         ? getDataViewOrTypedArrayByteLength(idlValue)
+    //         : ArrayBufferPrototypeGetByteLength(idlValue)
+    //     )
+    //   );
+    // } else if (idlType === 'HashAlgorithmIdentifier') {
+    //   normalizedAlgorithm[member] = normalizeAlgorithm(idlValue, 'digest');
+    // } else if (idlType === 'AlgorithmIdentifier') {
+    //   // This extension point is not used by any supported algorithm (yet?)
+    //   throw lazyDOMException('Not implemented.', 'NotSupportedError');
+    // }
+  }
+  return normalizedAlgorithm;
+};
+exports.normalizeAlgorithm = normalizeAlgorithm;
+//# sourceMappingURL=Algorithms.js.map

package/lib/commonjs/Algorithms.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["kSupportedAlgorithms","digest","generateKey","ECDSA","ECDH","HMAC","X25519","Ed25519","X448","Ed448","sign","verify","importKey","HKDF","PBKDF2","deriveBits","encrypt","decrypt","wrapKey","unwrapKey","simpleAlgorithmDictionaries","AesGcmParams","iv","additionalData","RsaHashedKeyGenParams","hash","EcKeyGenParams","HmacKeyGenParams","RsaPssParams","EcdsaParams","HmacImportParams","HkdfParams","salt","info","Ed448Params","context","Pbkdf2Params","RsaOaepParams","label","RsaHashedImportParams","EcKeyImportParams","normalizeAlgorithm","algorithm","op","name","registeredAlgorithms","algName","undefined","desiredType","key","Object","prototype","hasOwnProperty","call","toUpperCase","Error","normalizedAlgorithm","dict","dictKeys","keys","i","length","member","exports"],"sourceRoot":"../../src","sources":["Algorithms.ts"],"mappings":"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","ignoreList":[]}

package/lib/commonjs/Hash.js

@@ -97,6 +97,6 @@ const internalDigest = (algorithm, data) => {
   const normalizedHashName = (0, _Utils.normalizeHashName)(algorithm.name);
   const hash = new Hash(normalizedHashName);
   hash.update((0, _Utils.bufferLikeToArrayBuffer)(data));
-  return hash.digest();
+  return (0, _Utils.toArrayBuffer)(hash.digest());
 };
 //# sourceMappingURL=Hash.js.map