expo-crypto 10.1.1 → 11.0.0

package/CHANGELOG.md

@@ -10,6 +10,33 @@
 
 ### 💡 Others
 
+## 11.0.0 — 2022-07-07
+
+### 🎉 New features
+
+- The module on Android now uses JSI host object instead of the bridge module for communication between JavaScript and native code. ([#17614](https://github.com/expo/expo/pull/17614) by [@lukmccall](https://github.com/lukmccall))
+
+### 💡 Others
+
+- Migrated Expo modules definitions to the new naming convention. ([#17193](https://github.com/expo/expo/pull/17193) by [@tsapeta](https://github.com/tsapeta))
+
+## 10.2.0 — 2022-04-18
+
+### 🎉 New features
+
+- Native module on iOS is now written in Swift using the new API. ([#16129](https://github.com/expo/expo/pull/16129) by [@tsapeta](https://github.com/tsapeta))
+- Use JSI host object instead of the bridge module for communication between JavaScript and native code. ([#16972](https://github.com/expo/expo/pull/16972) by [@tsapeta](https://github.com/tsapeta))
+
+### ⚠️ Notices
+
+- On Android bump `compileSdkVersion` to `31`, `targetSdkVersion` to `31` and `Java` version to `11`. ([#16941](https://github.com/expo/expo/pull/16941) by [@bbarthec](https://github.com/bbarthec))
+
+## 10.1.2 - 2022-02-01
+
+### 🐛 Bug fixes
+
+- Fix `Plugin with id 'maven' not found` build error from Android Gradle 7. ([#16080](https://github.com/expo/expo/pull/16080) by [@kudo](https://github.com/kudo))
+
 ## 10.1.1 — 2021-12-08
 
 _This version does not introduce any user-facing changes._

package/README.md

@@ -4,12 +4,12 @@ Provides cryptography primitives.
 
 # API documentation
 
-- [Documentation for the master branch](https://github.com/expo/expo/blob/master/docs/pages/versions/unversioned/sdk/crypto.md)
-- [Documentation for the latest stable release](https://docs.expo.io/versions/latest/sdk/crypto/)
+- [Documentation for the main branch](https://github.com/expo/expo/blob/main/docs/pages/versions/unversioned/sdk/crypto.md)
+- [Documentation for the latest stable release](https://docs.expo.dev/versions/latest/sdk/crypto/)
 
 # Installation in managed Expo projects
 
-For managed [managed](https://docs.expo.io/versions/latest/introduction/managed-vs-bare/) Expo projects, please follow the installation instructions in the [API documentation for the latest stable release](https://docs.expo.io/versions/latest/sdk/crypto/).
+For [managed](https://docs.expo.dev/versions/latest/introduction/managed-vs-bare/) Expo projects, please follow the installation instructions in the [API documentation for the latest stable release](https://docs.expo.dev/versions/latest/sdk/crypto/).
 
 # Installation in bare React Native projects
 

package/android/build.gradle

@@ -1,63 +1,80 @@
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
-apply plugin: 'maven'
+apply plugin: 'maven-publish'
 
 group = 'host.exp.exponent'
-version = '10.1.1'
+version = '11.0.0'
 
 buildscript {
+  def expoModulesCorePlugin = new File(project(":expo-modules-core").projectDir.absolutePath, "ExpoModulesCorePlugin.gradle")
+  if (expoModulesCorePlugin.exists()) {
+    apply from: expoModulesCorePlugin
+    applyKotlinExpoModulesCorePlugin()
+  }
+
   // Simple helper that allows the root project to override versions declared by this library.
   ext.safeExtGet = { prop, fallback ->
     rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
   }
 
+  // Ensures backward compatibility
+  ext.getKotlinVersion = {
+    if (ext.has("kotlinVersion")) {
+      ext.kotlinVersion()
+    } else {
+      ext.safeExtGet("kotlinVersion", "1.6.10")
+    }
+  }
+
   repositories {
     mavenCentral()
   }
 
   dependencies {
-    classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${safeExtGet('kotlinVersion', '1.4.21')}")
+    classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${getKotlinVersion()}")
   }
 }
 
-// Upload android library to maven with javadoc and android sources
-configurations {
-  deployerJars
-}
-
 // Creating sources with comments
 task androidSourcesJar(type: Jar) {
   classifier = 'sources'
   from android.sourceSets.main.java.srcDirs
 }
 
-// Put the androidSources and javadoc to the artifacts
-artifacts {
-  archives androidSourcesJar
-}
-
-uploadArchives {
-  repositories {
-    mavenDeployer {
-      configuration = configurations.deployerJars
-      repository(url: mavenLocal().url)
+afterEvaluate {
+  publishing {
+    publications {
+      release(MavenPublication) {
+        from components.release
+        // Add additional sourcesJar to artifacts
+        artifact(androidSourcesJar)
+      }
+    }
+    repositories {
+      maven {
+        url = mavenLocal().url
+      }
     }
   }
 }
 
 android {
-  compileSdkVersion safeExtGet("compileSdkVersion", 30)
+  compileSdkVersion safeExtGet("compileSdkVersion", 31)
 
   compileOptions {
-    sourceCompatibility JavaVersion.VERSION_1_8
-    targetCompatibility JavaVersion.VERSION_1_8
+    sourceCompatibility JavaVersion.VERSION_11
+    targetCompatibility JavaVersion.VERSION_11
+  }
+
+  kotlinOptions {
+    jvmTarget = JavaVersion.VERSION_11.majorVersion
   }
 
   defaultConfig {
     minSdkVersion safeExtGet("minSdkVersion", 21)
-    targetSdkVersion safeExtGet("targetSdkVersion", 30)
+    targetSdkVersion safeExtGet("targetSdkVersion", 31)
     versionCode 25
-    versionName "10.1.1"
+    versionName "11.0.0"
   }
   lintOptions {
     abortOnError false
@@ -67,10 +84,10 @@ android {
 dependencies {
   implementation project(':expo-modules-core')
 
-  implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${safeExtGet('kotlinVersion', '1.4.21')}"
+  implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${getKotlinVersion()}"
 
-  if (project.findProject(':unimodules-test-core')) {
-    testImplementation project(':unimodules-test-core')
+  if (project.findProject(':expo-modules-test-core')) {
+    testImplementation project(':expo-modules-test-core')
   }
   testImplementation 'junit:junit:4.12'
   testImplementation "org.robolectric:robolectric:4.3.1"

package/android/src/main/java/expo/modules/crypto/CryptoModule.kt

@@ -1,45 +1,32 @@
 package expo.modules.crypto
 
-import android.content.Context
 import android.util.Base64
-
-import expo.modules.core.ExportedModule
-import expo.modules.core.Promise
-import expo.modules.core.interfaces.ExpoMethod
-
+import expo.modules.kotlin.modules.Module
+import expo.modules.kotlin.modules.ModuleDefinition
 import java.security.MessageDigest
-import java.security.NoSuchAlgorithmException
 
-class CryptoModule(context: Context) : ExportedModule(context) {
-  override fun getName() = "ExpoCrypto"
+class CryptoModule : Module() {
+  override fun definition() = ModuleDefinition {
+    Name("ExpoCrypto")
 
-  @ExpoMethod
-  fun digestStringAsync(algorithm: String, data: String, options: Map<String, Any?>, promise: Promise) {
-    val encoding = options["encoding"] as String?
+    Function("digestString", this@CryptoModule::digestString)
+    AsyncFunction("digestStringAsync", this@CryptoModule::digestString)
+  }
 
-    val messageDigest = try {
-      MessageDigest.getInstance(algorithm).apply { update(data.toByteArray()) }
-    } catch (e: NoSuchAlgorithmException) {
-      promise.reject("ERR_CRYPTO_DIGEST", e)
-      return
-    }
+  private fun digestString(algorithm: DigestAlgorithm, data: String, options: DigestOptions): String {
+    val messageDigest = MessageDigest.getInstance(algorithm.value).apply { update(data.toByteArray()) }
 
     val digest: ByteArray = messageDigest.digest()
-    when (encoding) {
-      "base64" -> {
-        val output = Base64.encodeToString(digest, Base64.NO_WRAP)
-        promise.resolve(output)
+    return when (options.encoding) {
+      DigestOptions.Encoding.BASE64 -> {
+        Base64.encodeToString(digest, Base64.NO_WRAP)
       }
-      "hex" -> {
-        val output = digest.joinToString(separator = "") { byte ->
+      DigestOptions.Encoding.HEX -> {
+        digest.joinToString(separator = "") { byte ->
           ((byte.toInt() and 0xff) + 0x100)
             .toString(radix = 16)
             .substring(startIndex = 1)
         }
-        promise.resolve(output)
-      }
-      else -> {
-        promise.reject("ERR_CRYPTO_DIGEST", "Invalid encoding type provided.")
       }
     }
   }

package/android/src/main/java/expo/modules/crypto/DigestAlgorithm.kt

@@ -0,0 +1,9 @@
+package expo.modules.crypto
+
+enum class DigestAlgorithm(val value: String) {
+  MD5("MD5"),
+  SHA1("SHA-1"),
+  SHA256("SHA-256"),
+  SHA384("SHA-384"),
+  SHA512("SHA-512")
+}

package/android/src/main/java/expo/modules/crypto/DigestOptions.kt

@@ -0,0 +1,14 @@
+package expo.modules.crypto
+
+import expo.modules.kotlin.records.Field
+import expo.modules.kotlin.records.Record
+
+class DigestOptions : Record {
+  @Field
+  var encoding: Encoding = Encoding.HEX
+
+  enum class Encoding(val value: String) {
+    HEX("hex"),
+    BASE64("base64")
+  }
+}

package/build/Crypto.d.ts

@@ -21,3 +21,4 @@ export * from './Crypto.types';
  * ```
  */
 export declare function digestStringAsync(algorithm: CryptoDigestAlgorithm, data: string, options?: CryptoDigestOptions): Promise<Digest>;
+//# sourceMappingURL=Crypto.d.ts.map

package/build/Crypto.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"Crypto.d.ts","sourceRoot":"","sources":["../src/Crypto.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,qBAAqB,EAAkB,mBAAmB,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AAGpG,cAAc,gBAAgB,CAAC;AAqC/B;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAsB,iBAAiB,CACrC,SAAS,EAAE,qBAAqB,EAChC,IAAI,EAAE,MAAM,EACZ,OAAO,GAAE,mBAAsD,GAC9D,OAAO,CAAC,MAAM,CAAC,CAUjB"}

package/build/Crypto.types.d.ts

@@ -1,9 +1,5 @@
 /**
  * [`Cryptographic hash function`](https://developer.mozilla.org/en-US/docs/Glossary/Cryptographic_hash_function)
- * is an algorithm that can be used to generate a checksum value. They have a variety of applications in cryptography.
- * > Cryptographic hash functions like [`SHA1`](https://developer.mozilla.org/en-US/docs/Web/API/SubtleCrypto/digest#SHA-1),
- * > `MD5` are **vulnerable**! Attacks have been proven to significantly reduce their collision resistance.
- * > Message-digest algorithms shouldn't be used for creating secure digests.
  */
 export declare enum CryptoDigestAlgorithm {
     /**
@@ -53,3 +49,4 @@ export declare type CryptoDigestOptions = {
     encoding: CryptoEncoding;
 };
 export declare type Digest = string;
+//# sourceMappingURL=Crypto.types.d.ts.map

package/build/Crypto.types.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"Crypto.types.d.ts","sourceRoot":"","sources":["../src/Crypto.types.ts"],"names":[],"mappings":"AACA;;GAEG;AACH,oBAAY,qBAAqB;IAC/B;;OAEG;IACH,IAAI,UAAU;IACd;;OAEG;IACH,MAAM,YAAY;IAClB;;OAEG;IACH,MAAM,YAAY;IAClB;;OAEG;IACH,MAAM,YAAY;IAClB;;;OAGG;IACH,GAAG,QAAQ;IACX;;;OAGG;IACH,GAAG,QAAQ;IACX;;;;OAIG;IACH,GAAG,QAAQ;CACZ;AAGD,oBAAY,cAAc;IACxB,GAAG,QAAQ;IACX;;OAEG;IACH,MAAM,WAAW;CAClB;AAGD,oBAAY,mBAAmB,GAAG;IAChC;;OAEG;IACH,QAAQ,EAAE,cAAc,CAAC;CAC1B,CAAC;AAGF,oBAAY,MAAM,GAAG,MAAM,CAAC"}

package/build/Crypto.types.js

@@ -1,10 +1,6 @@
 // @needsAudit
 /**
  * [`Cryptographic hash function`](https://developer.mozilla.org/en-US/docs/Glossary/Cryptographic_hash_function)
- * is an algorithm that can be used to generate a checksum value. They have a variety of applications in cryptography.
- * > Cryptographic hash functions like [`SHA1`](https://developer.mozilla.org/en-US/docs/Web/API/SubtleCrypto/digest#SHA-1),
- * > `MD5` are **vulnerable**! Attacks have been proven to significantly reduce their collision resistance.
- * > Message-digest algorithms shouldn't be used for creating secure digests.
  */
 export var CryptoDigestAlgorithm;
 (function (CryptoDigestAlgorithm) {

package/build/Crypto.types.js.map

@@ -1 +1 @@
-{"version":3,"file":"Crypto.types.js","sourceRoot":"","sources":["../src/Crypto.types.ts"],"names":[],"mappings":"AAAA,cAAc;AACd;;;;;;GAMG;AACH,MAAM,CAAN,IAAY,qBAiCX;AAjCD,WAAY,qBAAqB;IAC/B;;OAEG;IACH,uCAAc,CAAA;IACd;;OAEG;IACH,2CAAkB,CAAA;IAClB;;OAEG;IACH,2CAAkB,CAAA;IAClB;;OAEG;IACH,2CAAkB,CAAA;IAClB;;;OAGG;IACH,oCAAW,CAAA;IACX;;;OAGG;IACH,oCAAW,CAAA;IACX;;;;OAIG;IACH,oCAAW,CAAA;AACb,CAAC,EAjCW,qBAAqB,KAArB,qBAAqB,QAiChC;AAED,cAAc;AACd,MAAM,CAAN,IAAY,cAMX;AAND,WAAY,cAAc;IACxB,6BAAW,CAAA;IACX;;OAEG;IACH,mCAAiB,CAAA;AACnB,CAAC,EANW,cAAc,KAAd,cAAc,QAMzB","sourcesContent":["// @needsAudit\n/**\n * [`Cryptographic hash function`](https://developer.mozilla.org/en-US/docs/Glossary/Cryptographic_hash_function)\n * is an algorithm that can be used to generate a checksum value. They have a variety of applications in cryptography.\n * > Cryptographic hash functions like [`SHA1`](https://developer.mozilla.org/en-US/docs/Web/API/SubtleCrypto/digest#SHA-1),\n * > `MD5` are **vulnerable**! Attacks have been proven to significantly reduce their collision resistance.\n * > Message-digest algorithms shouldn't be used for creating secure digests.\n */\nexport enum CryptoDigestAlgorithm {\n  /**\n   * `160` bits.\n   */\n  SHA1 = 'SHA-1',\n  /**\n   * `256` bits. Collision Resistant.\n   */\n  SHA256 = 'SHA-256',\n  /**\n   * `384` bits. Collision Resistant.\n   */\n  SHA384 = 'SHA-384',\n  /**\n   * `512` bits. Collision Resistant.\n   */\n  SHA512 = 'SHA-512',\n  /**\n   * `128` bits.\n   * @platform ios\n   */\n  MD2 = 'MD2',\n  /**\n   * `128` bits.\n   * @platform ios\n   */\n  MD4 = 'MD4',\n  /**\n   * `128` bits.\n   * @platform android\n   * @platform ios\n   */\n  MD5 = 'MD5',\n}\n\n// @needsAudit\nexport enum CryptoEncoding {\n  HEX = 'hex',\n  /**\n   * Has trailing padding. Does not wrap lines. Does not have a trailing newline.\n   */\n  BASE64 = 'base64',\n}\n\n// @needsAudit\nexport type CryptoDigestOptions = {\n  /**\n   * Format the digest is returned in.\n   */\n  encoding: CryptoEncoding;\n};\n\n// @docsMissing\nexport type Digest = string;\n"]}
+{"version":3,"file":"Crypto.types.js","sourceRoot":"","sources":["../src/Crypto.types.ts"],"names":[],"mappings":"AAAA,cAAc;AACd;;GAEG;AACH,MAAM,CAAN,IAAY,qBAiCX;AAjCD,WAAY,qBAAqB;IAC/B;;OAEG;IACH,uCAAc,CAAA;IACd;;OAEG;IACH,2CAAkB,CAAA;IAClB;;OAEG;IACH,2CAAkB,CAAA;IAClB;;OAEG;IACH,2CAAkB,CAAA;IAClB;;;OAGG;IACH,oCAAW,CAAA;IACX;;;OAGG;IACH,oCAAW,CAAA;IACX;;;;OAIG;IACH,oCAAW,CAAA;AACb,CAAC,EAjCW,qBAAqB,KAArB,qBAAqB,QAiChC;AAED,cAAc;AACd,MAAM,CAAN,IAAY,cAMX;AAND,WAAY,cAAc;IACxB,6BAAW,CAAA;IACX;;OAEG;IACH,mCAAiB,CAAA;AACnB,CAAC,EANW,cAAc,KAAd,cAAc,QAMzB","sourcesContent":["// @needsAudit\n/**\n * [`Cryptographic hash function`](https://developer.mozilla.org/en-US/docs/Glossary/Cryptographic_hash_function)\n */\nexport enum CryptoDigestAlgorithm {\n  /**\n   * `160` bits.\n   */\n  SHA1 = 'SHA-1',\n  /**\n   * `256` bits. Collision Resistant.\n   */\n  SHA256 = 'SHA-256',\n  /**\n   * `384` bits. Collision Resistant.\n   */\n  SHA384 = 'SHA-384',\n  /**\n   * `512` bits. Collision Resistant.\n   */\n  SHA512 = 'SHA-512',\n  /**\n   * `128` bits.\n   * @platform ios\n   */\n  MD2 = 'MD2',\n  /**\n   * `128` bits.\n   * @platform ios\n   */\n  MD4 = 'MD4',\n  /**\n   * `128` bits.\n   * @platform android\n   * @platform ios\n   */\n  MD5 = 'MD5',\n}\n\n// @needsAudit\nexport enum CryptoEncoding {\n  HEX = 'hex',\n  /**\n   * Has trailing padding. Does not wrap lines. Does not have a trailing newline.\n   */\n  BASE64 = 'base64',\n}\n\n// @needsAudit\nexport type CryptoDigestOptions = {\n  /**\n   * Format the digest is returned in.\n   */\n  encoding: CryptoEncoding;\n};\n\n// @docsMissing\nexport type Digest = string;\n"]}

package/build/ExpoCrypto.d.ts

@@ -1,2 +1,3 @@
-declare const _default: import("expo-modules-core").ProxyNativeModule;
+declare const _default: any;
 export default _default;
+//# sourceMappingURL=ExpoCrypto.d.ts.map

package/build/ExpoCrypto.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ExpoCrypto.d.ts","sourceRoot":"","sources":["../src/ExpoCrypto.ts"],"names":[],"mappings":";AAEA,wBAAiD"}

package/build/ExpoCrypto.js

@@ -1,3 +1,3 @@
-import { NativeModulesProxy } from 'expo-modules-core';
-export default NativeModulesProxy.ExpoCrypto;
+import { requireNativeModule } from 'expo-modules-core';
+export default requireNativeModule('ExpoCrypto');
 //# sourceMappingURL=ExpoCrypto.js.map

package/build/ExpoCrypto.js.map

@@ -1 +1 @@
-{"version":3,"file":"ExpoCrypto.js","sourceRoot":"","sources":["../src/ExpoCrypto.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AACvD,eAAe,kBAAkB,CAAC,UAAU,CAAC","sourcesContent":["import { NativeModulesProxy } from 'expo-modules-core';\nexport default NativeModulesProxy.ExpoCrypto;\n"]}
+{"version":3,"file":"ExpoCrypto.js","sourceRoot":"","sources":["../src/ExpoCrypto.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AAExD,eAAe,mBAAmB,CAAC,YAAY,CAAC,CAAC","sourcesContent":["import { requireNativeModule } from 'expo-modules-core';\n\nexport default requireNativeModule('ExpoCrypto');\n"]}

package/build/ExpoCrypto.web.d.ts

@@ -4,3 +4,4 @@ declare const _default: {
     digestStringAsync(algorithm: CryptoDigestAlgorithm, data: string, options: CryptoDigestOptions): Promise<string>;
 };
 export default _default;
+//# sourceMappingURL=ExpoCrypto.web.d.ts.map

package/build/ExpoCrypto.web.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ExpoCrypto.web.d.ts","sourceRoot":"","sources":["../src/ExpoCrypto.web.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,qBAAqB,EAAkB,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;;;iCAO7E,qBAAqB,QAC1B,MAAM,WACH,mBAAmB,GAC3B,QAAQ,MAAM,CAAC;;AARpB,wBAyBE"}

package/expo-module.config.json

@@ -0,0 +1,10 @@
+{
+  "name": "expo-crypto",
+  "platforms": ["ios", "android"],
+  "ios": {
+    "modulesClassNames": ["CryptoModule"]
+  },
+  "android": {
+    "modulesClassNames": ["expo.modules.crypto.CryptoModule"]
+  }
+}

package/ios/CryptoModule.swift

@@ -0,0 +1,40 @@
+// Copyright 2022-present 650 Industries. All rights reserved.
+
+import CommonCrypto
+import ExpoModulesCore
+
+public class CryptoModule: Module {
+  public func definition() -> ModuleDefinition {
+    Name("ExpoCrypto")
+
+    AsyncFunction("digestStringAsync", digestString)
+
+    Function("digestString", digestString)
+  }
+}
+
+private func digestString(algorithm: DigestAlgorithm, str: String, options: DigestOptions) throws -> String {
+  guard let data = str.data(using: .utf8) else {
+    throw LossyConversionException()
+  }
+
+  let length = Int(algorithm.digestLength)
+  var digest = [UInt8](repeating: 0, count: length)
+
+  data.withUnsafeBytes { bytes in
+    let _ = algorithm.digest(bytes.baseAddress, UInt32(data.count), &digest)
+  }
+
+  switch options.encoding {
+  case .hex:
+    return digest.reduce("") { $0 + String(format: "%02x", $1) }
+  case .base64:
+    return Data(digest).base64EncodedString()
+  }
+}
+
+private class LossyConversionException: Exception {
+  override var reason: String {
+    "Unable to convert given string without losing some information"
+  }
+}

package/ios/DigestAlgorithm.swift

@@ -0,0 +1,63 @@
+// Copyright 2022-present 650 Industries. All rights reserved.
+
+import CommonCrypto
+import ExpoModulesCore
+
+typealias DigestFunction = (
+  _ data: UnsafeRawPointer?,
+  _ len: UInt32,
+  _ md: UnsafeMutablePointer<UInt8>?
+) -> UnsafeMutablePointer<UInt8>?
+
+internal enum DigestAlgorithm: String, EnumArgument {
+  case md2 = "MD2"
+  case md4 = "MD4"
+  case md5 = "MD5"
+  case sha1 = "SHA-1"
+  case sha224 = "SHA-224"
+  case sha256 = "SHA-256"
+  case sha384 = "SHA-384"
+  case sha512 = "SHA-512"
+
+  var digestLength: Int32 {
+    switch self {
+    case .md2:
+      return CC_MD2_DIGEST_LENGTH
+    case .md4:
+      return CC_MD4_DIGEST_LENGTH
+    case .md5:
+      return CC_MD5_DIGEST_LENGTH
+    case .sha1:
+      return CC_SHA1_DIGEST_LENGTH
+    case .sha224:
+      return CC_SHA224_DIGEST_LENGTH
+    case .sha256:
+      return CC_SHA256_DIGEST_LENGTH
+    case .sha384:
+      return CC_SHA384_DIGEST_LENGTH
+    case .sha512:
+      return CC_SHA512_DIGEST_LENGTH
+    }
+  }
+
+  var digest: DigestFunction {
+    switch self {
+    case .md2:
+      return CC_MD2
+    case .md4:
+      return CC_MD4
+    case .md5:
+      return CC_MD5
+    case .sha1:
+      return CC_SHA1
+    case .sha224:
+      return CC_SHA224
+    case .sha256:
+      return CC_SHA256
+    case .sha384:
+      return CC_SHA384
+    case .sha512:
+      return CC_SHA512
+    }
+  }
+}

package/ios/DigestOptions.swift

@@ -0,0 +1,13 @@
+// Copyright 2022-present 650 Industries. All rights reserved.
+
+import ExpoModulesCore
+
+internal struct DigestOptions: Record {
+  @Field
+  var encoding: Encoding = .hex
+
+  internal enum Encoding: String, EnumArgument {
+    case hex = "hex"
+    case base64 = "base64"
+  }
+}

package/ios/{EXCrypto.podspec → ExpoCrypto.podspec}

@@ -3,7 +3,7 @@ require 'json'
 package = JSON.parse(File.read(File.join(__dir__, '..', 'package.json')))
 
 Pod::Spec.new do |s|
-  s.name           = 'EXCrypto'
+  s.name           = 'ExpoCrypto'
   s.version        = package['version']
   s.summary        = package['description']
   s.description    = package['description']
@@ -11,15 +11,22 @@ Pod::Spec.new do |s|
   s.author         = package['author']
   s.homepage       = package['homepage']
   s.platform       = :ios, '12.0'
+  s.swift_version  = '5.4'
   s.source         = { git: 'https://github.com/expo/expo.git' }
   s.static_framework = true
 
   s.dependency 'ExpoModulesCore'
 
+  # Swift/Objective-C compatibility
+  s.pod_target_xcconfig = {
+    'DEFINES_MODULE' => 'YES',
+    'SWIFT_COMPILATION_MODE' => 'wholemodule'
+  }
+
   if !$ExpoUseSources&.include?(package['name']) && ENV['EXPO_USE_SOURCE'].to_i == 0 && File.exist?("#{s.name}.xcframework") && Gem::Version.new(Pod::VERSION) >= Gem::Version.new('1.10.0')
-    s.source_files = "#{s.name}/**/*.h"
+    s.source_files = "**/*.h"
     s.vendored_frameworks = "#{s.name}.xcframework"
   else
-    s.source_files = "#{s.name}/**/*.{h,m}"
+    s.source_files = "**/*.{h,m,swift}"
   end
 end

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-crypto",
-  "version": "10.1.1",
+  "version": "11.0.0",
   "description": "Expo universal module for crypto",
   "main": "build/Crypto.js",
   "types": "build/Crypto.d.ts",
@@ -45,5 +45,5 @@
   "peerDependencies": {
     "expo": "*"
   },
-  "gitHead": "cf8e7fde1b19e10dd9b74a8af0e9362ae8e14001"
+  "gitHead": "e893ff2b01e108cf246cec02318c0df9d6bc603c"
 }

package/src/Crypto.types.ts

@@ -1,10 +1,6 @@
 // @needsAudit
 /**
  * [`Cryptographic hash function`](https://developer.mozilla.org/en-US/docs/Glossary/Cryptographic_hash_function)
- * is an algorithm that can be used to generate a checksum value. They have a variety of applications in cryptography.
- * > Cryptographic hash functions like [`SHA1`](https://developer.mozilla.org/en-US/docs/Web/API/SubtleCrypto/digest#SHA-1),
- * > `MD5` are **vulnerable**! Attacks have been proven to significantly reduce their collision resistance.
- * > Message-digest algorithms shouldn't be used for creating secure digests.
  */
 export enum CryptoDigestAlgorithm {
   /**

package/src/ExpoCrypto.ts

@@ -1,2 +1,3 @@
-import { NativeModulesProxy } from 'expo-modules-core';
-export default NativeModulesProxy.ExpoCrypto;
+import { requireNativeModule } from 'expo-modules-core';
+
+export default requireNativeModule('ExpoCrypto');

package/tsconfig.json

@@ -5,5 +5,5 @@
     "outDir": "./build"
   },
   "include": ["./src"],
-  "exclude": ["**/__mocks__/*", "**/__tests__/*"]
+  "exclude": ["**/__mocks__/*", "**/__tests__/*", "**/__stories__/*"]
 }

package/android/src/main/java/expo/modules/crypto/CryptoPackage.kt

@@ -1,9 +0,0 @@
-package expo.modules.crypto
-
-import android.content.Context
-import expo.modules.core.BasePackage
-import expo.modules.core.ExportedModule
-
-class CryptoPackage : BasePackage() {
-  override fun createExportedModules(context: Context): List<ExportedModule> = listOf(CryptoModule(context))
-}

package/ios/EXCrypto/EXCrypto.h

@@ -1,7 +0,0 @@
-// Copyright 2019-present 650 Industries. All rights reserved.
-
-#import <ExpoModulesCore/EXExportedModule.h>
-
-@interface EXCrypto : EXExportedModule
-
-@end

package/ios/EXCrypto/EXCrypto.m

@@ -1,84 +0,0 @@
-// Copyright 2019-present 650 Industries. All rights reserved.
-
-#import <EXCrypto/EXCrypto.h>
-#import <CommonCrypto/CommonDigest.h>
-
-@implementation EXCrypto
-
-EX_EXPORT_MODULE(ExpoCrypto);
-
-EX_EXPORT_METHOD_AS(digestStringAsync,
-                    digestStringAsync:(NSString *)algorithm
-                    data:(NSString *)data
-                    options:(NSDictionary *)options
-                    resolver:(EXPromiseResolveBlock)resolve
-                    rejecter:(EXPromiseRejectBlock)reject)
-{
-  NSString *encoding = options[@"encoding"];
-  
-  int digestLength = [EXCrypto digestLengthForJSAlgorithm:algorithm];
-  if (digestLength == -1) {
-    reject(@"ERR_CRYPTO_DIGEST", [NSString stringWithFormat:@"Invalid hashing algorithm: %@", algorithm], nil);
-    return;
-  }
-  
-  NSData *_data = [data dataUsingEncoding:NSUTF8StringEncoding];
-  uint8_t digest[digestLength];
-  if ([algorithm isEqualToString:@"MD2"]) {
-    CC_MD2(_data.bytes, (CC_LONG)_data.length, digest);
-  } else if ([algorithm isEqualToString:@"MD4"]) {
-    CC_MD4(_data.bytes, (CC_LONG)_data.length, digest);
-  } else if ([algorithm isEqualToString:@"MD5"]) {
-    CC_MD5(_data.bytes, (CC_LONG)_data.length, digest);
-  } else if ([algorithm isEqualToString:@"SHA-1"]) {
-    CC_SHA1(_data.bytes, (CC_LONG)_data.length, digest);
-  } else if ([algorithm isEqualToString:@"SHA-224"]) {
-    CC_SHA224(_data.bytes, (CC_LONG)_data.length, digest);
-  } else if ([algorithm isEqualToString:@"SHA-256"]) {
-    CC_SHA256(_data.bytes, (CC_LONG)_data.length, digest);
-  } else if ([algorithm isEqualToString:@"SHA-384"]) {
-    CC_SHA384(_data.bytes, (CC_LONG)_data.length, digest);
-  } else if ([algorithm isEqualToString:@"SHA-512"]) {
-    CC_SHA512(_data.bytes, (CC_LONG)_data.length, digest);
-  }
-  
-  if ([encoding isEqualToString:@"hex"]) {
-    NSMutableString *output = [NSMutableString stringWithCapacity:digestLength * 2];
-    for (int i = 0; i < digestLength; i++) {
-      [output appendFormat:@"%02x", digest[i]];
-    }
-    resolve(output);
-    return;
-  } else if ([encoding isEqualToString:@"base64"]) {
-    NSData *originalData = [NSData dataWithBytes:digest length:digestLength];
-    NSString *output = [originalData base64EncodedStringWithOptions:0];
-    resolve(output);
-    return;
-  } else {
-    reject(@"ERR_CRYPTO_DIGEST", @"Invalid encoding type provided.", nil);
-    return;
-  }
-}
-
-+ (int)digestLengthForJSAlgorithm:(NSString *)input {
-  if ([input isEqualToString:@"MD2"]) {
-    return CC_MD2_DIGEST_LENGTH;
-  } else if ([input isEqualToString:@"MD4"]) {
-    return CC_MD4_DIGEST_LENGTH;
-  } else if ([input isEqualToString:@"MD5"]) {
-    return CC_MD5_DIGEST_LENGTH;
-  } else if ([input isEqualToString:@"SHA-1"]) {
-    return CC_SHA1_DIGEST_LENGTH;
-  } else if ([input isEqualToString:@"SHA-224"]) {
-    return CC_SHA224_DIGEST_LENGTH;
-  } else if ([input isEqualToString:@"SHA-256"]) {
-    return CC_SHA256_DIGEST_LENGTH;
-  } else if ([input isEqualToString:@"SHA-384"]) {
-    return CC_SHA384_DIGEST_LENGTH;
-  } else if ([input isEqualToString:@"SHA-512"]) {
-    return CC_SHA512_DIGEST_LENGTH;
-  }
-  return -1;
-}
-
-@end

package/unimodule.json

@@ -1,4 +0,0 @@
-{
-  "name": "expo-crypto",
-  "platforms": ["ios", "android"]
-}