fixed phew
This commit is contained in:
1 parent
e0d2de93f2
commit
1a49e5888f
1 file changed
+9
-13
@@ -91,10 +91,9 @@ class Phew(Challenge):
|
|||||||
self._read_until(proc, "pt (hex)", timeout=3.0)
|
self._read_until(proc, "pt (hex)", timeout=3.0)
|
||||||
self._read_until(proc, "> ", timeout=3.0)
|
self._read_until(proc, "> ", timeout=3.0)
|
||||||
self._send_line(proc, pt_hex)
|
self._send_line(proc, pt_hex)
|
||||||
out = self._read_until(proc, "\n", timeout=3.0)
|
out = self._read_until(proc, "> ", timeout=5.0)
|
||||||
ct_hex = self._expect_hex_field(out, "ct")
|
ct_hex = self._expect_hex_field(out, "ct")
|
||||||
self._read_until(proc, "> ", timeout=3.0)
|
self._send_line(proc, "9")
|
||||||
self._send_line(proc, "0")
|
|
||||||
try:
|
try:
|
||||||
proc.wait(timeout=2.0)
|
proc.wait(timeout=2.0)
|
||||||
except subprocess.TimeoutExpired:
|
except subprocess.TimeoutExpired:
|
||||||
@@ -113,10 +112,9 @@ class Phew(Challenge):
|
|||||||
self._read_until(proc, "ct (hex)", timeout=3.0)
|
self._read_until(proc, "ct (hex)", timeout=3.0)
|
||||||
self._read_until(proc, "> ", timeout=3.0)
|
self._read_until(proc, "> ", timeout=3.0)
|
||||||
self._send_line(proc, ct_hex)
|
self._send_line(proc, ct_hex)
|
||||||
out = self._read_until(proc, "\n", timeout=3.0)
|
out = self._read_until(proc, "> ", timeout=5.0)
|
||||||
pt_hex = self._expect_hex_field(out, "pt")
|
pt_hex = self._expect_hex_field(out, "pt")
|
||||||
self._read_until(proc, "> ", timeout=3.0)
|
self._send_line(proc, "9")
|
||||||
self._send_line(proc, "0")
|
|
||||||
try:
|
try:
|
||||||
proc.wait(timeout=2.0)
|
proc.wait(timeout=2.0)
|
||||||
except subprocess.TimeoutExpired:
|
except subprocess.TimeoutExpired:
|
||||||
@@ -132,10 +130,9 @@ class Phew(Challenge):
|
|||||||
try:
|
try:
|
||||||
self._read_until(proc, "> ", timeout=10.0)
|
self._read_until(proc, "> ", timeout=10.0)
|
||||||
self._send_line(proc, "4")
|
self._send_line(proc, "4")
|
||||||
out = self._read_until(proc, "\n", timeout=3.0)
|
out = self._read_until(proc, "> ", timeout=5.0)
|
||||||
ct_hex = self._expect_hex_field(out, "ct")
|
ct_hex = self._expect_hex_field(out, "ct")
|
||||||
self._read_until(proc, "> ", timeout=3.0)
|
self._send_line(proc, "9")
|
||||||
self._send_line(proc, "0")
|
|
||||||
try:
|
try:
|
||||||
proc.wait(timeout=2.0)
|
proc.wait(timeout=2.0)
|
||||||
except subprocess.TimeoutExpired:
|
except subprocess.TimeoutExpired:
|
||||||
@@ -155,10 +152,9 @@ class Phew(Challenge):
|
|||||||
self._read_until(proc, "key (hex)", timeout=3.0)
|
self._read_until(proc, "key (hex)", timeout=3.0)
|
||||||
self._read_until(proc, "> ", timeout=3.0)
|
self._read_until(proc, "> ", timeout=3.0)
|
||||||
self._send_line(proc, wrong_key_hex)
|
self._send_line(proc, wrong_key_hex)
|
||||||
line = self._read_until(proc, "\n", timeout=3.0).strip()
|
out = self._read_until(proc, "> ", timeout=5.0)
|
||||||
assert "nope" in line.lower(), f"bingo did not reject wrong key; got: {line!r}"
|
assert "nope" in out.lower(), f"bingo did not reject wrong key; got:\n{out[-300:]}"
|
||||||
self._read_until(proc, "> ", timeout=3.0)
|
self._send_line(proc, "9")
|
||||||
self._send_line(proc, "0")
|
|
||||||
try:
|
try:
|
||||||
proc.wait(timeout=2.0)
|
proc.wait(timeout=2.0)
|
||||||
except subprocess.TimeoutExpired:
|
except subprocess.TimeoutExpired:
|
||||||
|
|||||||
Reference in new issue
Block a user