Commit 44e69951 authored Aug 11, 2017 by FdaSilvaYY Committed by Rich Salz Aug 11, 2017

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)

parent 710769f0

apps/req.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1305,7 +1305,7 @@ static int check_end(const char str, const char end)

		/*
		* Merge the two strings together into the result buffer checking for
		* overflow and producing an error message is there is.
		* overflow and producing an error message if there is.
		*/
		static int join(char buf[], size_t buf_size, const char *name,
		const char tail, const char desc)

doc/man3/SSL_CONF_cmd.pod

+1 −1

Original line number	Diff line number	Diff line
		@@ -480,7 +480,7 @@ SSLv3 is B<always> disabled and attempt to override this by the user are
		ignored.

		By checking the return code of SSL_CONF_cmd() it is possible to query if a
		given B<cmd> is recognised, this is useful is SSL_CONF_cmd() values are
		given B<cmd> is recognised, this is useful if SSL_CONF_cmd() values are
		mixed with additional application specific operations.

		For example an application might call SSL_CONF_cmd() and if it returns

ssl/ssl_locl.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;

ssl/statem/extensions.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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)) {

ssl/statem/extensions_srvr.c

+3 −4

Original line number	Diff line number	Diff line
		@@ -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.