some fixes

Signed-off-by: Timo Glastra <[email protected]>
animo · Aug 1, 2024 · 29ab66d · 29ab66d
1 parent 0bb0307
commit 29ab66d
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 23 deletions.
diff --git a/apps/funke/app.config.js b/apps/funke/app.config.js
@@ -2,30 +2,18 @@ const { version } = require('./package.json')
 
 const APP_VARIANT = process.env.APP_VARIANT || 'production'
 
-// https://demo.pid-issuer.bundesdruckerei.de
-const bdrPidIssuerCertificate = `-----BEGIN CERTIFICATE-----
-MIICeTCCAiCgAwIBAgIUB5E9QVZtmUYcDtCjKB/H3VQv72gwCgYIKoZIzj0EAwIwgYgxCzAJBgNVBAYTAkRFMQ8wDQYDVQQHDAZCZXJsaW4xHTAbBgNVBAoMFEJ1bmRlc2RydWNrZXJlaSBHbWJIMREwDwYDVQQLDAhUIENTIElERTE2MDQGA1UEAwwtU1BSSU5EIEZ1bmtlIEVVREkgV2FsbGV0IFByb3RvdHlwZSBJc3N1aW5nIENBMB4XDTI0MDUzMTA2NDgwOVoXDTM0MDUyOTA2NDgwOVowgYgxCzAJBgNVBAYTAkRFMQ8wDQYDVQQHDAZCZXJsaW4xHTAbBgNVBAoMFEJ1bmRlc2RydWNrZXJlaSBHbWJIMREwDwYDVQQLDAhUIENTIElERTE2MDQGA1UEAwwtU1BSSU5EIEZ1bmtlIEVVREkgV2FsbGV0IFByb3RvdHlwZSBJc3N1aW5nIENBMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEYGzdwFDnc7+Kn5ibAvCOM8ke77VQxqfMcwZL8IaIA+WCROcCfmY/giH92qMru5p/kyOivE0RC/IbdMONvDoUyaNmMGQwHQYDVR0OBBYEFNRWGMCJOOgOWIQYyXZiv6u7xZC+MB8GA1UdIwQYMBaAFNRWGMCJOOgOWIQYyXZiv6u7xZC+MBIGA1UdEwEB/wQIMAYBAf8CAQAwDgYDVR0PAQH/BAQDAgGGMAoGCCqGSM49BAMCA0cAMEQCIGEm7wkZKHt/atb4MdFnXW6yrnwMUT2u136gdtl10Y6hAiBuTFqvVYth1rbxzCP0xWZHmQK9kVyxn8GPfX27EIzzsw==
------END CERTIFICATE-----`
-
-// https://funke.animo.id
-const animoFunkeRelyingPartyCertificate =
-  'MIIBAzCBq6ADAgECAhArxq0w60RTDK4WY9HzgcvBMAoGCCqGSM49BAMCMAAwIBcNNzAwMTAxMDAwMDAwWhgPMjI4NjExMjAxNzQ2NDBaMAAwOTATBgcqhkjOPQIBBggqhkjOPQMBBwMiAALcD1XzKepFxWMAOqV+ln1fybBt7DRO5CV0f9A6mRp2xaMlMCMwIQYDVR0RBBowGIYWaHR0cHM6Ly9mdW5rZS5hbmltby5pZDAKBggqhkjOPQQDAgNHADBEAiAfvGG6sqrvzIMWYpJB5VLloo9f51loYXSkKxJIOztlNwIgLLSvEl0Dmp5vtj2buZ2nXQ2RBKxiLbc5eYGeMeoUnjk='
-
 const variants = {
   development: {
     bundle: '.dev',
     name: ' (Dev)',
-    trustedCertificates: [animoFunkeRelyingPartyCertificate, bdrPidIssuerCertificate],
   },
   preview: {
     bundle: '.preview',
     name: ' (Preview)',
-    trustedCertificates: [animoFunkeRelyingPartyCertificate, bdrPidIssuerCertificate],
   },
   production: {
     bundle: '',
     name: '',
-    trustedCertificates: [animoFunkeRelyingPartyCertificate, bdrPidIssuerCertificate],
   },
 }
 
@@ -120,9 +108,8 @@ const config = {
   },
   extra: {
     eas: {
-      projectId: 'b5f457fa-bcab-4c6e-8092-8cdf1239027a',
+      projectId: 'todo',
     },
-    trustedCertificates: variant.trustedCertificates,
   },
 }
 

diff --git a/apps/funke/constants.ts b/apps/funke/constants.ts
@@ -1,12 +1,13 @@
-import ExpoConstants from 'expo-constants'
-
 export const FUNKE_WALLET_SEED_CREDENTIAL_RECORD_ID = 'FUNKE_WALLET_SEED_CREDENTIAL_RECORD_ID '
 export const FUNKE_WALLET_INSTANCE_LONG_TERM_AES_KEY_ID = 'FUNKE_WALLET_INSTANCE_LONG_TERM_AES_KEY_ID'
 
-const TRUSTED_CERTIFICATES = ExpoConstants.expoConfig?.extra?.trustedCertificates as [string, ...string[]] | undefined
+// https://demo.pid-issuer.bundesdruckerei.de
+const bdrPidIssuerCertificate = `-----BEGIN CERTIFICATE-----
+MIICeTCCAiCgAwIBAgIUB5E9QVZtmUYcDtCjKB/H3VQv72gwCgYIKoZIzj0EAwIwgYgxCzAJBgNVBAYTAkRFMQ8wDQYDVQQHDAZCZXJsaW4xHTAbBgNVBAoMFEJ1bmRlc2RydWNrZXJlaSBHbWJIMREwDwYDVQQLDAhUIENTIElERTE2MDQGA1UEAwwtU1BSSU5EIEZ1bmtlIEVVREkgV2FsbGV0IFByb3RvdHlwZSBJc3N1aW5nIENBMB4XDTI0MDUzMTA2NDgwOVoXDTM0MDUyOTA2NDgwOVowgYgxCzAJBgNVBAYTAkRFMQ8wDQYDVQQHDAZCZXJsaW4xHTAbBgNVBAoMFEJ1bmRlc2RydWNrZXJlaSBHbWJIMREwDwYDVQQLDAhUIENTIElERTE2MDQGA1UEAwwtU1BSSU5EIEZ1bmtlIEVVREkgV2FsbGV0IFByb3RvdHlwZSBJc3N1aW5nIENBMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEYGzdwFDnc7+Kn5ibAvCOM8ke77VQxqfMcwZL8IaIA+WCROcCfmY/giH92qMru5p/kyOivE0RC/IbdMONvDoUyaNmMGQwHQYDVR0OBBYEFNRWGMCJOOgOWIQYyXZiv6u7xZC+MB8GA1UdIwQYMBaAFNRWGMCJOOgOWIQYyXZiv6u7xZC+MBIGA1UdEwEB/wQIMAYBAf8CAQAwDgYDVR0PAQH/BAQDAgGGMAoGCCqGSM49BAMCA0cAMEQCIGEm7wkZKHt/atb4MdFnXW6yrnwMUT2u136gdtl10Y6hAiBuTFqvVYth1rbxzCP0xWZHmQK9kVyxn8GPfX27EIzzsw==
+-----END CERTIFICATE-----`
 
-if (!Array.isArray(TRUSTED_CERTIFICATES)) {
-  throw new Error('Trusted Certificates provided in the expo config is not an array')
-}
+// https://funke.animo.id
+const animoFunkeRelyingPartyCertificate =
+  'MIIBAzCBq6ADAgECAhArxq0w60RTDK4WY9HzgcvBMAoGCCqGSM49BAMCMAAwIBcNNzAwMTAxMDAwMDAwWhgPMjI4NjExMjAxNzQ2NDBaMAAwOTATBgcqhkjOPQIBBggqhkjOPQMBBwMiAALcD1XzKepFxWMAOqV+ln1fybBt7DRO5CV0f9A6mRp2xaMlMCMwIQYDVR0RBBowGIYWaHR0cHM6Ly9mdW5rZS5hbmltby5pZDAKBggqhkjOPQQDAgNHADBEAiAfvGG6sqrvzIMWYpJB5VLloo9f51loYXSkKxJIOztlNwIgLLSvEl0Dmp5vtj2buZ2nXQ2RBKxiLbc5eYGeMeoUnjk='
 
-export const trustedCertificates = TRUSTED_CERTIFICATES
+export const trustedCertificates = [bdrPidIssuerCertificate, animoFunkeRelyingPartyCertificate]
diff --git a/packages/secure-store/kdf.ts b/packages/secure-store/kdf.ts
@@ -10,12 +10,14 @@ import argon2 from 'react-native-argon2'
  *
  */
 const derive = async (pin: string, salt: string): Promise<string> => {
+  // Takes about 1.5 second on iPhone 14 Pro
+  // Need to test on Android/different devices as well
   const { rawHash } = await argon2(pin, salt, {
     hashLength: 32,
     mode: 'argon2id',
     parallelism: 4,
-    iterations: 1,
-    memory: 21,
+    iterations: 8,
+    memory: 64 * 1024,
   })
 
   return rawHash