From 2c3aeabed100fb16c33171c005aa41b026eccca1 Mon Sep 17 00:00:00 2001
From: Florian Dold <florian@dold.me>
Date: Wed, 13 Apr 2022 08:55:35 +0200
Subject: anastasis: salt rename

---
 packages/anastasis-core/src/index.ts          | 16 ++++++++--------
 packages/anastasis-core/src/provider-types.ts |  5 ++++-
 packages/anastasis-core/src/reducer-types.ts  |  4 ++--
 3 files changed, 14 insertions(+), 11 deletions(-)

(limited to 'packages/anastasis-core/src')

diff --git a/packages/anastasis-core/src/index.ts b/packages/anastasis-core/src/index.ts
index 5896dc655..52cb33f5a 100644
--- a/packages/anastasis-core/src/index.ts
+++ b/packages/anastasis-core/src/index.ts
@@ -314,7 +314,7 @@ async function getProviderInfo(
         type: x.type,
         usage_fee: x.cost,
       })),
-      salt: jsonResp.server_salt,
+      provider_salt: jsonResp.provider_salt,
       storage_limit_in_megabytes: jsonResp.storage_limit_in_megabytes,
       truth_upload_fee: jsonResp.truth_upload_fee,
     };
@@ -424,7 +424,7 @@ async function prepareRecoveryData(
         tm = {
           key_share: encodeCrock(getRandomBytes(32)),
           nonce: encodeCrock(getRandomBytes(24)),
-          truth_salt: encodeCrock(getRandomBytes(16)),
+          master_salt: encodeCrock(getRandomBytes(16)),
           truth_key: encodeCrock(getRandomBytes(64)),
           uuid: encodeCrock(getRandomBytes(32)),
           pol_method_index: methIndex,
@@ -457,8 +457,8 @@ async function prepareRecoveryData(
     escrowMethods.push({
       escrow_type: authMethod.type as any,
       instructions: authMethod.instructions,
-      provider_salt: provider.salt,
-      truth_salt: tm.truth_salt,
+      provider_salt: provider.provider_salt,
+      truth_salt: tm.master_salt,
       truth_key: tm.truth_key,
       url: meth.provider,
       uuid: tm.uuid,
@@ -514,7 +514,7 @@ async function uploadSecret(
       ] as AuthenticationProviderStatusOk;
       userId = userIdCache[providerUrl] = await userIdentifierDerive(
         state.identity_attributes!,
-        provider.salt,
+        provider.provider_salt,
       );
     }
     return userId;
@@ -525,7 +525,7 @@ async function uploadSecret(
     const meth = pol.methods[tm.pol_method_index];
     const authMethod =
       state.authentication_methods![meth.authentication_method];
-    const truthValue = await getTruthValue(authMethod, tm.uuid, tm.truth_salt);
+    const truthValue = await getTruthValue(authMethod, tm.uuid, tm.master_salt);
     const encryptedTruth = await encryptTruth(
       tm.nonce,
       tm.truth_key,
@@ -746,7 +746,7 @@ async function downloadPolicy(
     if (!pi || pi.status !== "ok") {
       continue;
     }
-    const userId = await userIdentifierDerive(userAttributes, pi.salt);
+    const userId = await userIdentifierDerive(userAttributes, pi.provider_salt);
     const acctKeypair = accountKeypairDerive(userId);
     const reqUrl = new URL(`policy/${acctKeypair.pub}`, prov.url);
     reqUrl.searchParams.set("version", `${prov.version}`);
@@ -1653,7 +1653,7 @@ export async function discoverPolicies(
     }
     const userId = await userIdentifierDerive(
       state.identity_attributes!,
-      providerInfo.salt,
+      providerInfo.provider_salt,
     );
     const acctKeypair = accountKeypairDerive(userId);
     const reqUrl = new URL(`policy/${acctKeypair.pub}/meta`, providerUrl);
diff --git a/packages/anastasis-core/src/provider-types.ts b/packages/anastasis-core/src/provider-types.ts
index b788f629d..72f2dc6e5 100644
--- a/packages/anastasis-core/src/provider-types.ts
+++ b/packages/anastasis-core/src/provider-types.ts
@@ -54,8 +54,11 @@ export interface EscrowConfigurationResponse {
   // **provider salt** is then used in various operations to ensure
   // cryptographic operations differ by provider.  A provider must
   // never change its salt value.
-  server_salt: string;
+  provider_salt: string;
 
+  /**
+   * Human-readable business name of the provider.
+   */
   business_name: string;
 }
 
diff --git a/packages/anastasis-core/src/reducer-types.ts b/packages/anastasis-core/src/reducer-types.ts
index 03b40e4bd..5b5f40297 100644
--- a/packages/anastasis-core/src/reducer-types.ts
+++ b/packages/anastasis-core/src/reducer-types.ts
@@ -266,7 +266,7 @@ export interface TruthMetaData {
   /**
    * Truth-specific salt.
    */
-  truth_salt: string;
+  master_salt: string;
 }
 
 export interface ReducerStateError {
@@ -316,7 +316,7 @@ export interface AuthenticationProviderStatusOk {
   currency: string;
   http_status: 200;
   liability_limit: string;
-  salt: string;
+  provider_salt: string;
   storage_limit_in_megabytes: number;
   truth_upload_fee: string;
   methods: MethodSpec[];
-- 
cgit v1.2.3