Merge branch 'master' into typo-section6

crypto/macs.md

@@ -53,7 +53,7 @@ There are a number of schemes out there, but one good one is AES-CMAC, an algori
 In AES-EMAC, the key $$K$$ is 256 bits, viewed as a pair of 128-bit AES keys: $$K=\langle K_1,K_2 \rangle$$. The message $$M$$ is decomposed into a sequence of 128-bit blocks: $$M = P_1 \Vert P_2 \Vert ... \Vert P_n$$. We set $$S_0 = 0$$ and compute
 
 $$
-S_i = \textrm{AES}_{K_1}(S*{i-1} \oplus P_i),\qquad
+S_i = \textrm{AES}_{K_1}(S_{i-1} \oplus P_i),\qquad
     \text{for $i=1,2,\dots,n$.}
 $$
 

index.md

@@ -13,7 +13,7 @@ This is the textbook for [CS 161: Computer Security](https://cs161.org/) at [UC
 
 ## Corrections
 
-As of the Summer 2023 semester, this textbook is still being actively maintained and updated. 
+As of the Spring 2024 semester, this textbook is still being actively maintained and updated. 
 
 If you see any parts that needs to be corrected, please open a Github issue [here](https://github.com/cs161-staff/textbook/issues).
 

web/intro.md

@@ -92,7 +92,7 @@ Here, we have a couple more headers and a different request type: the POST reque
 
 ## 18.5. HTTP: GET vs. POST
 
-While there are quite a few methods for requests, the two types that we will focus on for this course are GET requests and POST requests. GET requests are are generally intended for "getting" information from the server. POST requests are intended for sending information to the server that somehow modifies its internal state, such as adding a comment in a forum or changing your password.
+While there are quite a few methods for requests, the two types that we will focus on for this course are GET requests and POST requests. GET requests are generally intended for "getting" information from the server. POST requests are intended for sending information to the server that somehow modifies its internal state, such as adding a comment in a forum or changing your password.
 
 In the original HTTP model, GET requests are not supposed to change any server state. However, modern web applications often change server state in response to GET requests in query parameters.
 

web/sop.md

@@ -36,9 +36,9 @@ If a port is not specified, the port defaults to 80 for http and 443 for https.
 
 In general, the origin of a webpage is defined by its URL. However, there are a few exceptions to this rule:
 
-- JavaScript runs with the origin of the page that loads it. For example, if you include `<script src="http://google.com/tracking.js></script>` on `http://cs161.org`, the script has the origin of `http://cs161.org`.
+- JavaScript runs with the origin of the page that loads it. For example, if you include `<script src="http://google.com/tracking.js"></script>` on `http://cs161.org`, the script has the origin of `http://cs161.org`.
 
-- Images have the origin of the page that it comes from. For example, if you include `<img src="http://google.com/logo.jpg>` on `http://cs161.org`, the image has the origin of `http://google.com`. The page that loads the image (`http://cs161.org`) only knows about the image's dimensions when loading it.
+- Images have the origin of the page that it comes from. For example, if you include `<img src="http://google.com/logo.jpg">` on `http://cs161.org`, the image has the origin of `http://google.com`. The page that loads the image (`http://cs161.org`) only knows about the image's dimensions when loading it.
 
 - Frames have the origin of the URL where the frame is retrieved from, not the origin of the website that loads it. For example, if you include `<iframe src="http://google.com"></iframe>` on `http://cs161.org`, the frame has the origin of `http://google.com`.