summaryrefslogtreecommitdiffstats
path: root/ssl
diff options
context:
space:
mode:
authorFdaSilvaYY <fdasilvayy@gmail.com>2017-08-11 10:15:22 -0400
committerRich Salz <rsalz@openssl.org>2017-08-11 10:16:33 -0400
commit44e699515568abcae0e77d7315f9b5e393daa6d9 (patch)
tree6ae18242aeeab06ea032a3642fcf475835e81c5c /ssl
parent710769f0a9ed6b758bbf7ffa217c21b47f31a8a6 (diff)
Fix some Typos and indents
Reviewed-by: Andy Polyakov <appro@openssl.org> Reviewed-by: Rich Salz <rsalz@openssl.org> (Merged from https://github.com/openssl/openssl/pull/4108)
Diffstat (limited to 'ssl')
-rw-r--r--ssl/ssl_locl.h2
-rw-r--r--ssl/statem/extensions.c2
-rw-r--r--ssl/statem/extensions_srvr.c7
3 files changed, 5 insertions, 6 deletions
diff --git a/ssl/ssl_locl.h b/ssl/ssl_locl.h
index c78c28fe45..8b8625d7d5 100644
--- a/ssl/ssl_locl.h
+++ b/ssl/ssl_locl.h
@@ -2364,7 +2364,7 @@ typedef enum ticket_en {
TICKET_NO_DECRYPT,
/* a ticket was successfully decrypted */
TICKET_SUCCESS,
- /* same as above but the ticket needs to be reneewed */
+ /* same as above but the ticket needs to be renewed */
TICKET_SUCCESS_RENEW
} TICKET_RETURN;
diff --git a/ssl/statem/extensions.c b/ssl/statem/extensions.c
index f62b1fe65f..2268b271ce 100644
--- a/ssl/statem/extensions.c
+++ b/ssl/statem/extensions.c
@@ -720,7 +720,7 @@ int tls_construct_extensions(SSL *s, WPACKET *pkt, unsigned int context,
/* Add custom extensions first */
if ((context & SSL_EXT_CLIENT_HELLO) != 0) {
- /* On the server side with initiase during ClientHello parsing */
+ /* On the server side with initialise during ClientHello parsing */
custom_ext_init(&s->cert->custext);
}
if (!custom_ext_add(s, context, pkt, x, chainidx, max_version, &tmpal)) {
diff --git a/ssl/statem/extensions_srvr.c b/ssl/statem/extensions_srvr.c
index a3c2fbf7de..a70f53bf3d 100644
--- a/ssl/statem/extensions_srvr.c
+++ b/ssl/statem/extensions_srvr.c
@@ -87,10 +87,9 @@ int tls_parse_ctos_server_name(SSL *s, PACKET *pkt, unsigned int context,
}
/*
- * Although the server_name extension was intended to be
- * extensible to new name types, RFC 4366 defined the
- * syntax inextensibly and OpenSSL 1.0.x parses it as
- * such.
+ * Although the intent was for server_name to be extensible, RFC 4366
+ * was not clear about it; and so OpenSSL among other implementations,
+ * always and only allows a 'host_name' name types.
* RFC 6066 corrected the mistake but adding new name types
* is nevertheless no longer feasible, so act as if no other
* SNI types can exist, to simplify parsing.