The branch master has been updated via 44e699515568abcae0e77d7315f9b5e393daa6d9 (commit) from 710769f0a9ed6b758bbf7ffa217c21b47f31a8a6 (commit)
- Log ----------------------------------------------------------------- commit 44e699515568abcae0e77d7315f9b5e393daa6d9 Author: FdaSilvaYY <fdasilv...@gmail.com> Date: Fri Aug 11 10:15:22 2017 -0400 Fix some Typos and indents Reviewed-by: Andy Polyakov <ap...@openssl.org> Reviewed-by: Rich Salz <rs...@openssl.org> (Merged from https://github.com/openssl/openssl/pull/4108) ----------------------------------------------------------------------- Summary of changes: apps/req.c | 2 +- doc/man3/SSL_CONF_cmd.pod | 2 +- include/internal/o_dir.h | 10 +++++----- ssl/ssl_locl.h | 2 +- ssl/statem/extensions.c | 2 +- ssl/statem/extensions_srvr.c | 7 +++---- test/README.external | 2 +- test/handshake_helper.c | 2 +- test/secmemtest.c | 2 +- test/ssltest_old.c | 2 +- test/tls13secretstest.c | 2 +- util/dofile.pl | 2 +- util/find-doc-nits | 2 +- util/openssl-format-source | 2 +- 14 files changed, 20 insertions(+), 21 deletions(-) diff --git a/apps/req.c b/apps/req.c index f43dae5..dab67a0 100644 --- a/apps/req.c +++ b/apps/req.c @@ -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) diff --git a/doc/man3/SSL_CONF_cmd.pod b/doc/man3/SSL_CONF_cmd.pod index 529acdc..a812186 100644 --- a/doc/man3/SSL_CONF_cmd.pod +++ b/doc/man3/SSL_CONF_cmd.pod @@ -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 diff --git a/include/internal/o_dir.h b/include/internal/o_dir.h index b852751..f18fc67 100644 --- a/include/internal/o_dir.h +++ b/include/internal/o_dir.h @@ -45,12 +45,12 @@ extern "C" { typedef struct OPENSSL_dir_context_st OPENSSL_DIR_CTX; - /* - * returns NULL on error or end-of-directory. If it is end-of-directory, - * errno will be zero - */ +/* + * returns NULL on error or end-of-directory. If it is end-of-directory, + * errno will be zero + */ const char *OPENSSL_DIR_read(OPENSSL_DIR_CTX **ctx, const char *directory); - /* returns 1 on success, 0 on error */ +/* returns 1 on success, 0 on error */ int OPENSSL_DIR_end(OPENSSL_DIR_CTX **ctx); #ifdef __cplusplus diff --git a/ssl/ssl_locl.h b/ssl/ssl_locl.h index c78c28f..8b8625d 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 f62b1fe..2268b27 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 a3c2fbf..a70f53b 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. diff --git a/test/README.external b/test/README.external index b4b011b..ab0f7c2 100644 --- a/test/README.external +++ b/test/README.external @@ -126,7 +126,7 @@ explicitly run (with more debugging): $ VERBOSE=1 make TESTS=test_external_krb5 test -Test failures supressions +Test-failures suppressions ------------------------- krb5 will automatically adapt its test suite to account for the configuration diff --git a/test/handshake_helper.c b/test/handshake_helper.c index 6584e4d..d200332 100644 --- a/test/handshake_helper.c +++ b/test/handshake_helper.c @@ -855,7 +855,7 @@ static void do_reneg_setup_step(const SSL_TEST_CTX *test_ctx, PEER *peer) if (!SSL_renegotiate_pending(peer->ssl)) { /* * If we are the client we will always attempt to resume the - * session. The server may or may not resume dependant on the + * session. The server may or may not resume dependent on the * setting of SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION */ if (SSL_is_server(peer->ssl)) { diff --git a/test/secmemtest.c b/test/secmemtest.c index a6ccc3b..9efa2c8 100644 --- a/test/secmemtest.c +++ b/test/secmemtest.c @@ -32,7 +32,7 @@ static int test_sec_mem(void) if (!TEST_ptr(p) /* r = non-secure 20, p = secure 20, s = non-secure 20 */ || !TEST_true(CRYPTO_secure_allocated(p)) - /* 20 secure -> 32-byte minimum allocaton unit */ + /* 20 secure -> 32-byte minimum allocation unit */ || !TEST_size_t_eq(CRYPTO_secure_used(), 32)) goto end; q = OPENSSL_malloc(20); diff --git a/test/ssltest_old.c b/test/ssltest_old.c index 37e980d..3a8d9b2 100644 --- a/test/ssltest_old.c +++ b/test/ssltest_old.c @@ -2144,7 +2144,7 @@ int doit_biopair(SSL *s_ssl, SSL *c_ssl, long count, * Useful functions for querying the state of BIO pair endpoints: * * BIO_ctrl_pending(bio) number of bytes we can read now - * BIO_ctrl_get_read_request(bio) number of bytes needed to fulfil + * BIO_ctrl_get_read_request(bio) number of bytes needed to fulfill * other side's read attempt * BIO_ctrl_get_write_guarantee(bio) number of bytes we can write now * diff --git a/test/tls13secretstest.c b/test/tls13secretstest.c index 9f32fdf..1c47e41 100644 --- a/test/tls13secretstest.c +++ b/test/tls13secretstest.c @@ -289,7 +289,7 @@ static int test_handshake_secrets(void) if (!TEST_true(tls13_generate_handshake_secret(s, ecdhe_secret, sizeof(ecdhe_secret)))) { - TEST_info("Hanshake secret generation failed"); + TEST_info("Handshake secret generation failed"); goto err; } diff --git a/util/dofile.pl b/util/dofile.pl index 8b0c7b4..0d05574 100644 --- a/util/dofile.pl +++ b/util/dofile.pl @@ -91,7 +91,7 @@ package main; # Helper functions for the templates ################################# # It might be practical to quotify some strings and have them protected -# from possible harm. These functions primarly quote things that might +# from possible harm. These functions primarily quote things that might # be interpreted wrongly by a perl eval. # quotify1 STRING diff --git a/util/find-doc-nits b/util/find-doc-nits index 2623d6c..7f5f1eb 100755 --- a/util/find-doc-nits +++ b/util/find-doc-nits @@ -289,7 +289,7 @@ sub checkmacros() } close(IN); } - print "# Found $count macros missing (not all should be documnted)\n" + print "# Found $count macros missing (not all should be documented)\n" } sub printem() diff --git a/util/openssl-format-source b/util/openssl-format-source index 3dcc128..2655e9c 100755 --- a/util/openssl-format-source +++ b/util/openssl-format-source @@ -111,7 +111,7 @@ do # the process-comments options and then undo that marking, and then # finally re-run indent without process-comments so the marked-to- # be-ignored comments we did automatically end up getting moved - # into the right possition within the code as indent leaves marked + # into the right position within the code as indent leaves marked # comments entirely untouched - we appear to have no way to avoid # the double processing and get the desired output cat "$j" | \ _____ openssl-commits mailing list To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits