summaryrefslogtreecommitdiffstats
path: root/ssl
diff options
context:
space:
mode:
authorDr. David von Oheimb <David.von.Oheimb@siemens.com>2020-06-10 17:49:25 +0200
committerDr. David von Oheimb <David.von.Oheimb@siemens.com>2020-07-05 11:29:43 +0200
commit1dc1ea182be183d8a393fdce4494360aee059cd2 (patch)
tree88ed6f74c0c79a5efa10a7f463061ed223b97fa6 /ssl
parent036cbb6bbf30955abdcffaf6e52cd926d8d8ee75 (diff)
Fix many MarkDown issues in {NOTES*,README*,HACKING,LICENSE}.md files
Reviewed-by: Tim Hudson <tjh@openssl.org> (Merged from https://github.com/openssl/openssl/pull/12109)
Diffstat (limited to 'ssl')
-rw-r--r--ssl/record/README.md61
-rw-r--r--ssl/statem/README.md96
2 files changed, 78 insertions, 79 deletions
diff --git a/ssl/record/README.md b/ssl/record/README.md
index 630fe8027a..263f257c84 100644
--- a/ssl/record/README.md
+++ b/ssl/record/README.md
@@ -18,10 +18,10 @@ of libssl.
The source files map to components as follows:
-dtls1_bitmap.c -> DTLS1_BITMAP component
-ssl3_buffer.c -> SSL3_BUFFER component
-ssl3_record.c -> SSL3_RECORD component
-rec_layer_s3.c, rec_layer_d1.c -> RECORD_LAYER component
+ dtls1_bitmap.c -> DTLS1_BITMAP component
+ ssl3_buffer.c -> SSL3_BUFFER component
+ ssl3_record.c -> SSL3_RECORD component
+ rec_layer_s3.c, rec_layer_d1.c -> RECORD_LAYER component
The RECORD_LAYER component is a facade pattern, i.e. it provides a simplified
interface to the record layer for the rest of libssl. The other 3 components are
@@ -38,33 +38,32 @@ RECORD_LAYER_* macros.
Conceptually it looks like this:
- libssl
- |
----------------------------|-----record.h--------------------------------------
- |
- _______V______________
- | |
- | RECORD_LAYER |
- | |
- | rec_layer_s3.c |
- | ^ |
- | _________|__________ |
- || ||
- || DTLS1_RECORD_LAYER ||
- || ||
- || rec_layer_d1.c ||
- ||____________________||
- |______________________|
- record_local.h ^ ^ ^
- _________________| | |_________________
- | | |
- _____V_________ ______V________ _______V________
- | | | | | |
- | SSL3_BUFFER | | SSL3_RECORD | | DTLS1_BITMAP |
- | |--->| | | |
- | ssl3_buffer.c | | ssl3_record.c | | dtls1_bitmap.c |
- |_______________| |_______________| |________________|
-
+ libssl
+ |
+ -------------------------|-----record.h------------------------------------
+ |
+ _______V______________
+ | |
+ | RECORD_LAYER |
+ | |
+ | rec_layer_s3.c |
+ | ^ |
+ | _________|__________ |
+ || ||
+ || DTLS1_RECORD_LAYER ||
+ || ||
+ || rec_layer_d1.c ||
+ ||____________________||
+ |______________________|
+ record_local.h ^ ^ ^
+ _________________| | |_________________
+ | | |
+ _____V_________ ______V________ _______V________
+ | | | | | |
+ | SSL3_BUFFER | | SSL3_RECORD | | DTLS1_BITMAP |
+ | |--->| | | |
+ | ssl3_buffer.c | | ssl3_record.c | | dtls1_bitmap.c |
+ |_______________| |_______________| |________________|
The two RECORD_LAYER source files build on each other, i.e.
the main one is rec_layer_s3.c which provides the core SSL/TLS layer. The second
diff --git a/ssl/statem/README.md b/ssl/statem/README.md
index 86cc066372..ef33f77c82 100644
--- a/ssl/statem/README.md
+++ b/ssl/statem/README.md
@@ -6,23 +6,24 @@ state machine code to aid future maintenance.
The state machine code replaces an older state machine present in OpenSSL
versions 1.0.2 and below. The new state machine has the following objectives:
- - Remove duplication of state code between client and server
- - Remove duplication of state code between TLS and DTLS
- - Simplify transitions and bring the logic together in a single location
- so that it is easier to validate
- - Remove duplication of code between each of the message handling functions
- - Receive a message first and then work out whether that is a valid
- transition - not the other way around (the other way causes lots of issues
- where we are expecting one type of message next but actually get something
- else)
- - Separate message flow state from handshake state (in order to better
- understand each)
- - message flow state = when to flush buffers; handling restarts in the
- event of NBIO events; handling the common flow of steps for reading a
- message and the common flow of steps for writing a message etc
- - handshake state = what handshake message are we working on now
- - Control complexity: only the state machine can change state: keep all
- the state changes local to the state machine component
+
+ - Remove duplication of state code between client and server
+ - Remove duplication of state code between TLS and DTLS
+ - Simplify transitions and bring the logic together in a single location
+ so that it is easier to validate
+ - Remove duplication of code between each of the message handling functions
+ - Receive a message first and then work out whether that is a valid
+ transition - not the other way around (the other way causes lots of issues
+ where we are expecting one type of message next but actually get something
+ else)
+ - Separate message flow state from handshake state (in order to better
+ understand each)
+ * message flow state = when to flush buffers; handling restarts in the
+ event of NBIO events; handling the common flow of steps for reading a
+ message and the common flow of steps for writing a message etc
+ * handshake state = what handshake message are we working on now
+ - Control complexity: only the state machine can change state: keep all
+ the state changes local to the state machine component
The message flow state machine is divided into a reading sub-state machine and a
writing sub-state machine. See the source comments in statem.c for a more
@@ -30,34 +31,33 @@ detailed description of the various states and transitions possible.
Conceptually the state machine component is designed as follows:
- libssl
- |
----------------------------|-----statem.h--------------------------------------
- |
- _______V____________________
- | |
- | statem.c |
- | |
- | Core state machine code |
- |____________________________|
- statem_local.h ^ ^
- _________| |_______
- | |
- _____________|____________ _____________|____________
- | | | |
- | statem_clnt.c | | statem_srvr.c |
- | | | |
- | TLS/DTLS client specific | | TLS/DTLS server specific |
- | state machine code | | state machine code |
- |__________________________| |__________________________|
- | |_______________|__ |
- | ________________| | |
- | | | |
- ____________V_______V________ ________V______V_______________
- | | | |
- | statem_both.c | | statem_dtls.c |
- | | | |
- | Non core functions common | | Non core functions common to |
- | to both servers and clients | | both DTLS servers and clients |
- |_____________________________| |_______________________________|
-
+ libssl
+ |
+ -------------------------|-----statem.h------------------------------------
+ |
+ _______V____________________
+ | |
+ | statem.c |
+ | |
+ | Core state machine code |
+ |____________________________|
+ statem_local.h ^ ^
+ _________| |_______
+ | |
+ _____________|____________ _____________|____________
+ | | | |
+ | statem_clnt.c | | statem_srvr.c |
+ | | | |
+ | TLS/DTLS client specific | | TLS/DTLS server specific |
+ | state machine code | | state machine code |
+ |__________________________| |__________________________|
+ | |_______________|__ |
+ | ________________| | |
+ | | | |
+ ____________V_______V________ ________V______V_______________
+ | | | |
+ | statem_both.c | | statem_dtls.c |
+ | | | |
+ | Non core functions common | | Non core functions common to |
+ | to both servers and clients | | both DTLS servers and clients |
+ |_____________________________| |_______________________________|