From 6cddc84846a9a09b65f5b7ad8e0cfaf1aff04f23 Mon Sep 17 00:00:00 2001 From: Nemo Date: Wed, 12 Apr 2023 20:06:53 +0530 Subject: [PATCH] Drop urls.txt --- Dockerfile | 3 +-- README.md | 2 +- book.md | 62 ++++++++++++++++++++++++++--------------------------- generate.sh | 7 +----- urls.txt | 31 --------------------------- 5 files changed, 34 insertions(+), 71 deletions(-) delete mode 100644 urls.txt diff --git a/Dockerfile b/Dockerfile index 61822ce..304ebda 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,6 @@ FROM python:3-alpine -RUN apk add --no-cache wget ca-certificates && \ - pip install pystitcher +RUN pip install pystitcher WORKDIR /security-engineering-ebook diff --git a/README.md b/README.md index 86a2173..dfd9441 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ See `book.md` for the bookmark titles used by the script. ## How to generate the book? -Run `./generate.sh`. You will need [`pystitcher`](https://pypi.org/project/pystitcher/), and `wget` installed. Alternatively, you can run it using Docker. +Run `./generate.sh`. You will need [`pystitcher`](https://pypi.org/project/pystitcher/) installed. Alternatively, you can run it using Docker. ### Docker diff --git a/book.md b/book.md index 930cc8d..7168d6b 100644 --- a/book.md +++ b/book.md @@ -3,64 +3,64 @@ author: Ross Anderson [Cover](cover.pdf) -[Preface](SEv3-pref-May16.pdf) +[Preface](https://www.cl.cam.ac.uk/~rja14/Papers/SEv3-pref-May16.pdf) -[1. What is Security Engineering?](SEv3-ch1-7sep.pdf) +[1. What is Security Engineering?](https://web.archive.org/web/2021if_/https://www.cl.cam.ac.uk/~rja14/Papers/SEv3-ch1-7sep.pdf) -[2. Who is the Opponent?](SEv3-ch2-7sep.pdf) +[2. Who is the Opponent?](https://www.cl.cam.ac.uk/~rja14/Papers/SEv3-ch2-7sep.pdf) -[3. Psychology and Usability](SEv3-ch3-7sep.pdf) +[3. Psychology and Usability](https://web.archive.org/web/2021if_/https://www.cl.cam.ac.uk/~rja14/Papers/SEv3-ch3-7sep.pdf) -[4. Protocols](SEv3-ch4-7sep.pdf) +[4. Protocols](https://web.archive.org/web/2021if_/https://www.cl.cam.ac.uk/~rja14/Papers/SEv3-ch4-7sep.pdf) -[5. Cryptography](SEv3-ch5-7sep.pdf) +[5. Cryptography](https://web.archive.org/web/20201018090028if_/https://www.cl.cam.ac.uk/~rja14/Papers/SEv3-ch5-7sep.pdf) -[6. Access Control](SEv3-ch6-7sep.pdf) +[6. Access Control](https://web.archive.org/web/2021if_/https://www.cl.cam.ac.uk/~rja14/Papers/SEv3-ch6-7sep.pdf) -[7. Distributed Systems](SEv3-ch7-7sep.pdf) +[7. Distributed Systems](https://web.archive.org/web/2021if_/https://www.cl.cam.ac.uk/~rja14/Papers/SEv3-ch7-7sep.pdf) -[8. Economics](SEv3-ch8-7sep.pdf) +[8. Economics](https://web.archive.org/web/2021if_/https://www.cl.cam.ac.uk/~rja14/Papers/SEv3-ch8-7sep.pdf) -[9. Multilevel Security](SEv3-ch9-7sep.pdf) +[9. Multilevel Security](https://web.archive.org/web/2021if_/https://www.cl.cam.ac.uk/~rja14/Papers/SEv3-ch9-7sep.pdf) -[10. Boundaries](SEv3-ch10-7sep.pdf) +[10. Boundaries](https://web.archive.org/web/2021if_/https://www.cl.cam.ac.uk/~rja14/Papers/SEv3-ch10-7sep.pdf) -[11. Inference Control](SEv3-ch11-7sep.pdf) +[11. Inference Control](https://www.cl.cam.ac.uk/~rja14/Papers/SEv3-ch11-7sep.pdf) -[12. Banking and Bookkeeping](SEv3-ch12-7sep.pdf) +[12. Banking and Bookkeeping](https://web.archive.org/web/2021if_/https://www.cl.cam.ac.uk/~rja14/Papers/SEv3-ch12-7sep.pdf) -[13. Physical Protection](SEv3-ch13-7sep.pdf) +[13. Physical Protection](https://web.archive.org/web/2021if_/https://www.cl.cam.ac.uk/~rja14/Papers/SEv3-ch13-7sep.pdf) -[14. Monitoring and Metering](SEv3-ch14-7sep.pdf) +[14. Monitoring and Metering](https://web.archive.org/web/2021if_/https://www.cl.cam.ac.uk/~rja14/Papers/SEv3-ch14-7sep.pdf) -[15. Nuclear Command and Control](SEv3-ch15-7sep.pdf) +[15. Nuclear Command and Control](https://web.archive.org/web/2021if_/https://www.cl.cam.ac.uk/~rja14/Papers/SEv3-ch15-7sep.pdf) -[16. Security Printing and Seals](SEv3-ch16-7sep.pdf) +[16. Security Printing and Seals](https://web.archive.org/web/2021if_/https://www.cl.cam.ac.uk/~rja14/Papers/SEv3-ch16-7sep.pdf) -[17. Biometrics](SEv3-ch17-7sep.pdf) +[17. Biometrics](https://web.archive.org/web/2021if_/https://www.cl.cam.ac.uk/~rja14/Papers/SEv3-ch17-7sep.pdf) -[18. Physical Tamper Resistance](SEv3-ch18-7sep.pdf) +[18. Physical Tamper Resistance](https://web.archive.org/web/2021if_/https://www.cl.cam.ac.uk/~rja14/Papers/SEv3-ch18-7sep.pdf) -[19. Side Channels](SEv3-ch19-7sep.pdf) +[19. Side Channels](https://www.cl.cam.ac.uk/~rja14/Papers/SEv3-ch19-7sep.pdf) -[20. Advanced Cryptographic Engineering](SEv3-ch20-7sep.pdf) +[20. Advanced Cryptographic Engineering](https://www.cl.cam.ac.uk/~rja14/Papers/SEv3-ch20-7sep.pdf) -[21. Network Attack and Defence](SEv3-ch21-7sep.pdf) +[21. Network Attack and Defence](https://web.archive.org/web/2021if_/https://www.cl.cam.ac.uk/~rja14/Papers/SEv3-ch21-7sep.pdf) -[22. Phones](SEv3-ch22-7sep.pdf) +[22. Phones](https://www.cl.cam.ac.uk/~rja14/Papers/SEv3-ch22-7sep.pdf) -[23. Electronic and Information Warfare](SEv3-ch23-7sep.pdf) +[23. Electronic and Information Warfare](https://web.archive.org/web/2021if_/https://www.cl.cam.ac.uk/~rja14/Papers/SEv3-ch23-7sep.pdf) -[24: Copyright and DRM](SEv3-ch24-7sep.pdf) +[24: Copyright and DRM](https://web.archive.org/web/2021if_/https://www.cl.cam.ac.uk/~rja14/Papers/SEv3-ch24-7sep.pdf) -[25: Taking Stock](SEv3-ch25-7sep.pdf) +[25: Taking Stock](https://www.cl.cam.ac.uk/~rja14/Papers/SEv3-ch25-7sep.pdf) -[26. Surveillance or Privacy?](SEv3-ch26-7sep.pdf) +[26. Surveillance or Privacy?](https://www.cl.cam.ac.uk/~rja14/Papers/SEv3-ch26-7sep.pdf) -[27. Secure Systems Development](SEv3-ch27-7sep.pdf) +[27. Secure Systems Development](https://web.archive.org/web/2021if_/https://www.cl.cam.ac.uk/~rja14/Papers/SEv3-ch27-7sep.pdf) -[28. Assurance and Sustainability](SEv3-ch28-7sep.pdf) +[28. Assurance and Sustainability](https://web.archive.org/web/2021if_/https://www.cl.cam.ac.uk/~rja14/Papers/SEv3-ch28-7sep.pdf) -[29. Beyond “Computer Says No”](SEv3-ch29-7sep.pdf) +[29. Beyond “Computer Says No”](https://web.archive.org/web/2021if_/https://www.cl.cam.ac.uk/~rja14/Papers/SEv3-ch29-7sep.pdf) -[Bibliography](SEv3-bib-7sep.pdf) \ No newline at end of file +[Bibliography](https://www.cl.cam.ac.uk/~rja14/Papers/SEv3-bib-7sep.pdf) \ No newline at end of file diff --git a/generate.sh b/generate.sh index f2a7625..a62ebe6 100755 --- a/generate.sh +++ b/generate.sh @@ -1,7 +1,6 @@ #!/bin/sh FINAL_PDF=security-engineering-3rd-edition.pdf -INPUT_FILE="urls.txt" function assert_installed() { for var in "$@"; do @@ -12,10 +11,6 @@ function assert_installed() { done } -assert_installed wget pystitcher - -echo "Starting PDF download" -wget --timeout=10 --timestamping --input-file "urls.txt" -echo "All PDFs downloaded" +assert_installed pystitcher pystitcher book.md "$FINAL_PDF" diff --git a/urls.txt b/urls.txt deleted file mode 100644 index 0a57cd9..0000000 --- a/urls.txt +++ /dev/null @@ -1,31 +0,0 @@ -https://www.cl.cam.ac.uk/~rja14/Papers/SEv3-pref-May16.pdf -https://web.archive.org/web/2021if_/https://www.cl.cam.ac.uk/~rja14/Papers/SEv3-ch1-7sep.pdf -https://www.cl.cam.ac.uk/~rja14/Papers/SEv3-ch2-7sep.pdf -https://web.archive.org/web/2021if_/https://www.cl.cam.ac.uk/~rja14/Papers/SEv3-ch3-7sep.pdf -https://web.archive.org/web/2021if_/https://www.cl.cam.ac.uk/~rja14/Papers/SEv3-ch4-7sep.pdf -https://web.archive.org/web/20201018090028if_/https://www.cl.cam.ac.uk/~rja14/Papers/SEv3-ch5-7sep.pdf -https://web.archive.org/web/2021if_/https://www.cl.cam.ac.uk/~rja14/Papers/SEv3-ch6-7sep.pdf -https://web.archive.org/web/2021if_/https://www.cl.cam.ac.uk/~rja14/Papers/SEv3-ch7-7sep.pdf -https://web.archive.org/web/2021if_/https://www.cl.cam.ac.uk/~rja14/Papers/SEv3-ch8-7sep.pdf -https://web.archive.org/web/2021if_/https://www.cl.cam.ac.uk/~rja14/Papers/SEv3-ch9-7sep.pdf -https://web.archive.org/web/2021if_/https://www.cl.cam.ac.uk/~rja14/Papers/SEv3-ch10-7sep.pdf -https://www.cl.cam.ac.uk/~rja14/Papers/SEv3-ch11-7sep.pdf -https://web.archive.org/web/2021if_/https://www.cl.cam.ac.uk/~rja14/Papers/SEv3-ch12-7sep.pdf -https://web.archive.org/web/2021if_/https://www.cl.cam.ac.uk/~rja14/Papers/SEv3-ch13-7sep.pdf -https://web.archive.org/web/2021if_/https://www.cl.cam.ac.uk/~rja14/Papers/SEv3-ch14-7sep.pdf -https://web.archive.org/web/2021if_/https://www.cl.cam.ac.uk/~rja14/Papers/SEv3-ch15-7sep.pdf -https://web.archive.org/web/2021if_/https://www.cl.cam.ac.uk/~rja14/Papers/SEv3-ch16-7sep.pdf -https://web.archive.org/web/2021if_/https://www.cl.cam.ac.uk/~rja14/Papers/SEv3-ch17-7sep.pdf -https://web.archive.org/web/2021if_/https://www.cl.cam.ac.uk/~rja14/Papers/SEv3-ch18-7sep.pdf -https://www.cl.cam.ac.uk/~rja14/Papers/SEv3-ch19-7sep.pdf -https://www.cl.cam.ac.uk/~rja14/Papers/SEv3-ch20-7sep.pdf -https://web.archive.org/web/2021if_/https://www.cl.cam.ac.uk/~rja14/Papers/SEv3-ch21-7sep.pdf -https://www.cl.cam.ac.uk/~rja14/Papers/SEv3-ch22-7sep.pdf -https://web.archive.org/web/2021if_/https://www.cl.cam.ac.uk/~rja14/Papers/SEv3-ch23-7sep.pdf -https://web.archive.org/web/2021if_/https://www.cl.cam.ac.uk/~rja14/Papers/SEv3-ch24-7sep.pdf -https://www.cl.cam.ac.uk/~rja14/Papers/SEv3-ch25-7sep.pdf -https://www.cl.cam.ac.uk/~rja14/Papers/SEv3-ch26-7sep.pdf -https://web.archive.org/web/2021if_/https://www.cl.cam.ac.uk/~rja14/Papers/SEv3-ch27-7sep.pdf -https://web.archive.org/web/2021if_/https://www.cl.cam.ac.uk/~rja14/Papers/SEv3-ch28-7sep.pdf -https://web.archive.org/web/2021if_/https://www.cl.cam.ac.uk/~rja14/Papers/SEv3-ch29-7sep.pdf -https://www.cl.cam.ac.uk/~rja14/Papers/SEv3-bib-7sep.pdf