From ab88cd964490f93c68ddb2e5a77a073e411d9bf5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marta=20Marczykowska-G=C3=B3recka?= Date: Tue, 11 Jul 2017 21:39:01 +0200 Subject: [PATCH] minor amends to clock synchronization renamed date_out variable to untrusted_date_out --- qvm-tools/qvm-sync-clock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/qvm-tools/qvm-sync-clock b/qvm-tools/qvm-sync-clock index a6ce0c5d..866c56d8 100755 --- a/qvm-tools/qvm-sync-clock +++ b/qvm-tools/qvm-sync-clock @@ -31,13 +31,13 @@ def main(): clockvm = app.clockvm p = clockvm.run_service('qubes.GetDate') - date_out = p.stdout.read(25).decode('ascii', errors='strict') - date_out = date_out.strip() + untrusted_date_out = p.stdout.read(25).decode('ascii', errors='strict') + untrusted_date_out = untrusted_date_out.strip() - if not re.match(r'^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\+00:?00$', date_out): + if not re.match(r'^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\+00:?00$', untrusted_date_out): sys.stderr.write('Invalid date received, aborting!') sys.exit(1) - subprocess.check_call(['date', '-u', '-Iseconds', '-s', date_out], + subprocess.check_call(['date', '-u', '-Iseconds', '-s', untrusted_date_out], stdout=subprocess.DEVNULL) subprocess.check_call(['hwclock', '--systohc'], stdout=subprocess.DEVNULL)