diff --git a/package-lock.json b/package-lock.json index ae112e8ec..caf580ba8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "phoenix", - "version": "5.1.1-0", + "version": "5.1.3-0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "phoenix", - "version": "5.1.1-0", + "version": "5.1.3-0", "dependencies": { "@bugsnag/js": "^7.18.0", "@floating-ui/dom": "^0.5.4", diff --git a/src-node/package-lock.json b/src-node/package-lock.json index edb8b114d..459799020 100644 --- a/src-node/package-lock.json +++ b/src-node/package-lock.json @@ -1,12 +1,12 @@ { "name": "@phcode/node-core", - "version": "5.1.2-0", + "version": "5.1.3-0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@phcode/node-core", - "version": "5.1.2-0", + "version": "5.1.3-0", "license": "GNU-AGPL3.0", "dependencies": { "@expo/sudo-prompt": "^9.3.2", diff --git a/src/phoenix/trust_ring.js b/src/phoenix/trust_ring.js index 6f40ee906..0c92fb2d7 100644 --- a/src/phoenix/trust_ring.js +++ b/src/phoenix/trust_ring.js @@ -179,8 +179,7 @@ function _selectKeys() { } const CRED_KEY_API = Phoenix.isTestWindow ? "API_KEY_TEST" : "API_KEY"; -const CRED_KEY_PROMO = Phoenix.isTestWindow ? "PROMO_GRANT_KEY_TEST" : "PROMO_GRANT_KEY"; -const SIGNATURE_SALT_KEY = Phoenix.isTestWindow ? "SIGNATURE_SALT_KEY_TEST" : "SIGNATURE_SALT_KEY"; +const CRED_KEY_PROMO = Phoenix.isTestWindow ? "PROMO_GRANT_KEY_TEST" : "PROMO_GRANT_KEY_1"; const VERSION_PORTER_KEY = Phoenix.isTestWindow ? "VERSION_PORTER_TEST" : "VERSION_PORTER"; const { key, iv } = _selectKeys(); @@ -278,7 +277,6 @@ async function reinstallCreds() { // Read current credential values const apiKey = await getCredential(CRED_KEY_API); const promoKey = await getCredential(CRED_KEY_PROMO); - const saltKey = await getCredential(SIGNATURE_SALT_KEY); // Remove credentials from keychain if(apiKey) { @@ -287,9 +285,6 @@ async function reinstallCreds() { if(promoKey) { await removeCredential(CRED_KEY_PROMO); } - if(saltKey) { - await removeCredential(SIGNATURE_SALT_KEY); - } // Re-set credentials to refresh keychain access if(apiKey) { @@ -298,9 +293,6 @@ async function reinstallCreds() { if(promoKey) { await setCredential(CRED_KEY_PROMO, promoKey); } - if(saltKey) { - await setCredential(SIGNATURE_SALT_KEY, saltKey); - } const currentVersion = Phoenix.metadata.version; await setCredential(VERSION_PORTER_KEY, currentVersion); @@ -383,7 +375,6 @@ async function validateDataSignature(data, signature, salt) { window.KernalModeTrust = { CRED_KEY_API, CRED_KEY_PROMO, - SIGNATURE_SALT_KEY, aesKeys: { key, iv }, setCredential, getCredential, diff --git a/tracking-repos.json b/tracking-repos.json index 0fd19f4ee..1a399227f 100644 --- a/tracking-repos.json +++ b/tracking-repos.json @@ -1,5 +1,5 @@ { "phoenixPro": { - "commitID": "5a18f02c59ee3fc8d70b637117fcdfdda66fa9bb" + "commitID": "775eb2660a4e912cd603ee85e8da7ef031b5c688" } }