From 9f0429cb2f8ad9cb2e98a787139602d913c1aefa Mon Sep 17 00:00:00 2001
From: Florian Dold <florian@dold.me>
Date: Wed, 17 Nov 2021 10:23:22 +0100
Subject: wallet: implement exchange protocol v9

---
 .../taler-wallet-core/src/operations/backup/import.ts |  9 +++++++--
 .../taler-wallet-core/src/operations/backup/index.ts  | 19 ++++++++++---------
 2 files changed, 17 insertions(+), 11 deletions(-)

(limited to 'packages/taler-wallet-core/src/operations/backup')

diff --git a/packages/taler-wallet-core/src/operations/backup/import.ts b/packages/taler-wallet-core/src/operations/backup/import.ts
index 7623ab189..e8e1de0b9 100644
--- a/packages/taler-wallet-core/src/operations/backup/import.ts
+++ b/packages/taler-wallet-core/src/operations/backup/import.ts
@@ -202,7 +202,7 @@ export interface CompletedCoin {
  * as the async crypto worker communication would auto-close the database transaction.
  */
 export interface BackupCryptoPrecomputedData {
-  denomPubToHash: Record<string, string>;
+  rsaDenomPubToHash: Record<string, string>;
   coinPrivToCompletedCoin: Record<string, CompletedCoin>;
   proposalNoncePrivToPub: { [priv: string]: string };
   proposalIdToContractTermsHash: { [proposalId: string]: string };
@@ -330,8 +330,13 @@ export async function importBackup(
         }
 
         for (const backupDenomination of backupExchangeDetails.denominations) {
+          if (backupDenomination.denom_pub.cipher !== 1) {
+            throw Error("unsupported cipher");
+          }
           const denomPubHash =
-            cryptoComp.denomPubToHash[backupDenomination.denom_pub];
+            cryptoComp.rsaDenomPubToHash[
+              backupDenomination.denom_pub.rsa_public_key
+            ];
           checkLogicInvariant(!!denomPubHash);
           const existingDenom = await tx.denominations.get([
             backupExchangeDetails.base_url,
diff --git a/packages/taler-wallet-core/src/operations/backup/index.ts b/packages/taler-wallet-core/src/operations/backup/index.ts
index 3f4c02274..9027625cd 100644
--- a/packages/taler-wallet-core/src/operations/backup/index.ts
+++ b/packages/taler-wallet-core/src/operations/backup/index.ts
@@ -40,6 +40,7 @@ import {
   ConfirmPayResultType,
   durationFromSpec,
   getTimestampNow,
+  hashDenomPub,
   HttpStatusCode,
   j2s,
   Logger,
@@ -57,10 +58,7 @@ import {
 import { gunzipSync, gzipSync } from "fflate";
 import { InternalWalletState } from "../../common.js";
 import { kdf } from "@gnu-taler/taler-util";
-import {
-  secretbox,
-  secretbox_open,
-} from "@gnu-taler/taler-util";
+import { secretbox, secretbox_open } from "@gnu-taler/taler-util";
 import {
   bytesToString,
   decodeCrock,
@@ -162,13 +160,16 @@ async function computeBackupCryptoData(
 ): Promise<BackupCryptoPrecomputedData> {
   const cryptoData: BackupCryptoPrecomputedData = {
     coinPrivToCompletedCoin: {},
-    denomPubToHash: {},
+    rsaDenomPubToHash: {},
     proposalIdToContractTermsHash: {},
     proposalNoncePrivToPub: {},
     reservePrivToPub: {},
   };
   for (const backupExchangeDetails of backupContent.exchange_details) {
     for (const backupDenom of backupExchangeDetails.denominations) {
+      if (backupDenom.denom_pub.cipher !== 1) {
+        throw Error("unsupported cipher");
+      }
       for (const backupCoin of backupDenom.coins) {
         const coinPub = encodeCrock(
           eddsaGetPublic(decodeCrock(backupCoin.coin_priv)),
@@ -176,16 +177,16 @@ async function computeBackupCryptoData(
         const blindedCoin = rsaBlind(
           hash(decodeCrock(backupCoin.coin_priv)),
           decodeCrock(backupCoin.blinding_key),
-          decodeCrock(backupDenom.denom_pub),
+          decodeCrock(backupDenom.denom_pub.rsa_public_key),
         );
         cryptoData.coinPrivToCompletedCoin[backupCoin.coin_priv] = {
           coinEvHash: encodeCrock(hash(blindedCoin)),
           coinPub,
         };
       }
-      cryptoData.denomPubToHash[backupDenom.denom_pub] = encodeCrock(
-        hash(decodeCrock(backupDenom.denom_pub)),
-      );
+      cryptoData.rsaDenomPubToHash[
+        backupDenom.denom_pub.rsa_public_key
+      ] = encodeCrock(hashDenomPub(backupDenom.denom_pub));
     }
     for (const backupReserve of backupExchangeDetails.reserves) {
       cryptoData.reservePrivToPub[backupReserve.reserve_priv] = encodeCrock(
-- 
cgit v1.2.3