Skip to content

Commit

Permalink
Detect tty for unattended mode
Browse files Browse the repository at this point in the history
Call digest() only once

Fix nonce comment

Issues linuxboot#160 linuxboot#159
  • Loading branch information
tasket committed May 4, 2023
1 parent e04116b commit 6a60573
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions src/wyng
Original file line number Diff line number Diff line change
Expand Up @@ -973,7 +973,7 @@ class DataCryptography:
if self.counter % self.ctcadence == 0: self.save_counter()
if self.counter > self.max_count: raise ValueError("Key exhaustion.")

# Nonce composed from: 32bit current time offset + 80bit rnd + 80bit counter
# Nonce from keyed hash of rnd || buf
nonce_h = hashlib.blake2b(self.get_rnd(24), key=self.key, digest_size=self.nonce_sz)
nonce_h.update(buf)
nonce = nonce_h.digest()
Expand Down Expand Up @@ -2839,7 +2839,7 @@ def send_volume(storage, vol, curtime, ses_tags, send_all):
else:
# Compress chunk and hash it
buf = compress(buf, compresslevel)
bhash = gethash(buf) ; b64hash = b64enc(bhash.digest()).decode("ascii")
bhashb = gethash(buf).digest() ; b64hash = b64enc(bhashb).decode("ascii")

# Skip when current and prior chunks are the same
if compare_digest(fman_hash, b64hash): continue
Expand All @@ -2864,7 +2864,6 @@ def send_volume(storage, vol, curtime, ses_tags, send_all):

# If chunk already in archive, link to it
if dedup:
bhashb = bhash.digest()
i = b2int(bhashb[:ht_ksize], "big")
pos = hashtree[i].find(bhashb) ; ddses = None
if pos % hash_w == 0:
Expand Down Expand Up @@ -4090,7 +4089,7 @@ def cleanup():

# Constants / Globals
prog_name = "wyng"
prog_version = "0.4alpha3" ; prog_date = "20230429"
prog_version = "0.4alpha3" ; prog_date = "20230503"
format_version = 3 ; debug = False ; tmpdir = None
admin_permission = os.getuid() == 0
time_start = time.time()
Expand Down Expand Up @@ -4189,6 +4188,7 @@ if options.action in write_actions+("arch-init","monitor") and not admin_permiss
if options.action == "version": x_it(0,"")
if options.action not in ("send", "arch-deduplicate"): options.dedup = False
if options.action == "arch-deduplicate": options.dedup = True
options.unattended = options.unattended or not sys.stdin.isatty()


## General Configuration ##
Expand Down

0 comments on commit 6a60573

Please sign in to comment.