[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-wallet-core] branch master updated: always round timestamps befor
From: |
gnunet |
Subject: |
[taler-wallet-core] branch master updated: always round timestamps before signature creation/verification |
Date: |
Tue, 07 Apr 2020 10:42:36 +0200 |
This is an automated email from the git hooks/post-receive script.
dold pushed a commit to branch master
in repository wallet-core.
The following commit(s) were added to refs/heads/master by this push:
new 34eca9c5 always round timestamps before signature creation/verification
34eca9c5 is described below
commit 34eca9c51215485c70492d6edea3513ada1c8895
Author: Florian Dold <address@hidden>
AuthorDate: Tue Apr 7 14:12:29 2020 +0530
always round timestamps before signature creation/verification
---
src/crypto/workers/cryptoImplementation.ts | 24 +++++++++++++-----------
src/util/time.ts | 14 ++++++++++++++
2 files changed, 27 insertions(+), 11 deletions(-)
diff --git a/src/crypto/workers/cryptoImplementation.ts
b/src/crypto/workers/cryptoImplementation.ts
index 96ad29bc..de3b88bb 100644
--- a/src/crypto/workers/cryptoImplementation.ts
+++ b/src/crypto/workers/cryptoImplementation.ts
@@ -64,7 +64,7 @@ import {
} from "../talerCrypto";
import { randomBytes } from "../primitives/nacl-fast";
import { kdf } from "../primitives/kdf";
-import { Timestamp, getTimestampNow } from "../../util/time";
+import { Timestamp, getTimestampNow, timestampTruncateToSecond } from
"../../util/time";
enum SignaturePurpose {
RESERVE_WITHDRAW = 1200,
@@ -94,13 +94,15 @@ function amountToBuffer(amount: AmountJson): Uint8Array {
return u8buf;
}
-function timestampToBuffer(ts: Timestamp): Uint8Array {
+function timestampRoundedToBuffer(ts: Timestamp): Uint8Array {
const b = new ArrayBuffer(8);
const v = new DataView(b);
- const s = BigInt(ts.t_ms) * BigInt(1000);
+ const tsRounded = timestampTruncateToSecond(ts);
+ const s = BigInt(tsRounded.t_ms) * BigInt(1000);
v.setBigUint64(0, s);
return new Uint8Array(b);
}
+
class SignaturePurposeBuilder {
private chunks: Uint8Array[] = [];
@@ -245,8 +247,8 @@ export class CryptoImplementation {
isValidWireFee(type: string, wf: WireFee, masterPub: string): boolean {
const p = buildSigPS(SignaturePurpose.MASTER_WIRE_FEES)
.put(hash(stringToBytes(type + "\0")))
- .put(timestampToBuffer(wf.startStamp))
- .put(timestampToBuffer(wf.endStamp))
+ .put(timestampRoundedToBuffer(wf.startStamp))
+ .put(timestampRoundedToBuffer(wf.endStamp))
.put(amountToBuffer(wf.wireFee))
.put(amountToBuffer(wf.closingFee))
.build();
@@ -261,10 +263,10 @@ export class CryptoImplementation {
isValidDenom(denom: DenominationRecord, masterPub: string): boolean {
const p = buildSigPS(SignaturePurpose.MASTER_DENOMINATION_KEY_VALIDITY)
.put(decodeCrock(masterPub))
- .put(timestampToBuffer(denom.stampStart))
- .put(timestampToBuffer(denom.stampExpireWithdraw))
- .put(timestampToBuffer(denom.stampExpireDeposit))
- .put(timestampToBuffer(denom.stampExpireLegal))
+ .put(timestampRoundedToBuffer(denom.stampStart))
+ .put(timestampRoundedToBuffer(denom.stampExpireWithdraw))
+ .put(timestampRoundedToBuffer(denom.stampExpireDeposit))
+ .put(timestampRoundedToBuffer(denom.stampExpireLegal))
.put(amountToBuffer(denom.value))
.put(amountToBuffer(denom.feeWithdraw))
.put(amountToBuffer(denom.feeDeposit))
@@ -330,8 +332,8 @@ export class CryptoImplementation {
const d = buildSigPS(SignaturePurpose.WALLET_COIN_DEPOSIT)
.put(decodeCrock(depositInfo.contractTermsHash))
.put(decodeCrock(depositInfo.wireInfoHash))
- .put(timestampToBuffer(depositInfo.timestamp))
- .put(timestampToBuffer(depositInfo.refundDeadline))
+ .put(timestampRoundedToBuffer(depositInfo.timestamp))
+ .put(timestampRoundedToBuffer(depositInfo.refundDeadline))
.put(amountToBuffer(depositInfo.spendAmount))
.put(amountToBuffer(depositInfo.feeDeposit))
.put(decodeCrock(depositInfo.merchantPub))
diff --git a/src/util/time.ts b/src/util/time.ts
index ea4f8ca8..f296aba1 100644
--- a/src/util/time.ts
+++ b/src/util/time.ts
@@ -49,6 +49,7 @@ export function getTimestampNow(): Timestamp {
export function getDurationRemaining(
deadline: Timestamp,
now = getTimestampNow(),
+
): Duration {
if (deadline.t_ms === "never") {
return { d_ms: "forever" };
@@ -72,6 +73,19 @@ export function timestampMin(t1: Timestamp, t2: Timestamp):
Timestamp {
return { t_ms: Math.min(t1.t_ms, t2.t_ms) };
}
+/**
+ * Truncate a timestamp so that that it represents a multiple
+ * of seconds. The timestamp is always rounded down.
+ */
+export function timestampTruncateToSecond(t1: Timestamp): Timestamp {
+ if (t1.t_ms === "never") {
+ return { t_ms: "never" };
+ }
+ return {
+ t_ms: Math.floor(t1.t_ms / 1000) * 1000,
+ };
+}
+
export function durationMin(d1: Duration, d2: Duration): Duration {
if (d1.d_ms === "forever") {
return { d_ms: d2.d_ms };
--
To stop receiving notification emails like this one, please contact
address@hidden.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [taler-wallet-core] branch master updated: always round timestamps before signature creation/verification,
gnunet <=