diff --git a/Makefile b/Makefile index f104c03..0712953 100644 --- a/Makefile +++ b/Makefile @@ -21,5 +21,6 @@ $(WRITEUP_PDF): $(DOCS_ALL) fonts.tex top.md @cp fonts.tex build/fonts.tex @for md in top.md $(DOCS_ALL); do cat $$md; printf "\n\n----------\n\n"; done > build/writeup.md @echo "PDF writeup.pdf" - @cd build && pandoc -f markdown-implicit_figures -i writeup.md --pdf-engine=lualatex -o writeup.pdf + @cd build && pandoc --filter pandoc-include-code -f markdown-implicit_figures -i writeup.md \ + --pdf-engine=lualatex -o writeup.pdf @cp build/writeup.pdf $@ diff --git a/aaaa/attitude-adjustment/attitude.py b/aaaa/attitude-adjustment/attitude.py index 411f254..1e92cbe 100644 --- a/aaaa/attitude-adjustment/attitude.py +++ b/aaaa/attitude-adjustment/attitude.py @@ -30,7 +30,7 @@ def solve_orientation(stars, catalog): rotation = Rotation.from_matrix(np.linalg.inv(rotation_mtx)) return rotation -TICKET = 'ticket{papa21503yankee:GGntHycE-_FqMqGbIoz7rKZD-MzEraoec3dRGU21ExVYGGYFLJQQlRLqNLWn8D4ghQ}' +TICKET = 'THE_TICKET' r = tubes.remote.remote('attitude.satellitesabove.me', 5012) r.send(TICKET+'\n') time.sleep(0.5) @@ -40,4 +40,4 @@ for _ in range(20): rotation = solve_orientation(stars, catalog) r.send(','.join([str(x) for x in rotation.as_quat()]) + '\n') time.sleep(0.1) -print(r.clean()) \ No newline at end of file +print(r.clean()) diff --git a/aaaa/seeing-stars/README.md b/aaaa/seeing-stars/README.md index 35e54c5..765d785 100644 --- a/aaaa/seeing-stars/README.md +++ b/aaaa/seeing-stars/README.md @@ -64,5 +64,5 @@ Run it: ``` ## Resources and other writeups -- https://docs.opencv.org/trunk/d9/d61/tutorial_py_morphological_ops.html -- https://docs.opencv.org/trunk/dd/d49/tutorial_py_contour_features.html +- +- diff --git a/aaaa/seeing-stars/seeing-stars.py b/aaaa/seeing-stars/seeing-stars.py index a8ac82e..a503bb9 100755 --- a/aaaa/seeing-stars/seeing-stars.py +++ b/aaaa/seeing-stars/seeing-stars.py @@ -33,7 +33,7 @@ def solve(rawdat): solve += (str(cX) + "," + str(cY)+'\n') return solve -TICKET = 'ticket{juliet73678uniform:GIE7kv0AbxY1I813dEkfLYg2PhHMnJcdqhouI2zuDG1md_2TQ1Ikgab5osJoTRFzIg}' +TICKET = 'THE_TICKET' r = tubes.remote.remote('stars.satellitesabove.me', 5013) r.recvline() r.send(TICKET+'\n') diff --git a/satellite-bus/magic-bus/magic-bus.py b/satellite-bus/magic-bus/magic-bus.py index e46fcee..b24acd8 100644 --- a/satellite-bus/magic-bus/magic-bus.py +++ b/satellite-bus/magic-bus/magic-bus.py @@ -4,7 +4,7 @@ import sys from pwnlib import tubes -TICKET = 'ticket{oscar39616kilo:GPvmwTTzj5JlUEWS4qze0U3-MIIoybpJ5VAClSr3D6-3uOBwYuvsP1RK8jfQixupxQ}' +TICKET = 'THE_TICKET' r = tubes.remote.remote('bus.satellitesabove.me', 5041) r.send(TICKET+'\n') time.sleep(0.5) @@ -31,7 +31,8 @@ def decode_pkt(b): field4 = to_hex(b[27:30]) if b[30] != ord('?'): print('b[30] is not ?') - print(': 00:00:00 > {} {} {} @ {} {} {} ?'.format(field1, field1end, field2, field3, field3end, field4)) + print(': 00:00:00 > {} {} {} @ {} {} {} ?'.format(field1, field1end, field2, + field3, field3end, field4)) elif b[0] == ord(';'): print('delimiter') # end of previous packet? else: @@ -41,7 +42,7 @@ def decode_pkt(b): start = True inj = b"^3b+00+00+37+." -inj2 = b"^ca+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+00+." +inj2 = b"^ca+" + (b"00+" * 512) + b"." dont = False inj2_b = False