[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  f7c798e34b50d3cc09629537153bb60ae9ea85fc (commit)
      from  2cf28d6127fdfbfb43d21b87514f08d925ca0c3a (commit)


- Log -----------------------------------------------------------------
commit f7c798e34b50d3cc09629537153bb60ae9ea85fc
Author: Rich Salz <rsalz at akamai.com>
Date:   Wed Feb 24 10:59:14 2016 -0500

    Fix typo, reformat comment.
    
    Reviewed-by: Andy Polyakov <appro at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 apps/s_socket.c | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/apps/s_socket.c b/apps/s_socket.c
index 5d66ab9..958dd78 100644
--- a/apps/s_socket.c
+++ b/apps/s_socket.c
@@ -167,9 +167,9 @@ int init_client(int *sock, const char *host, const char *port,
 
     ret = 0;
     for (ai = res; ai != NULL; ai = BIO_ADDRINFO_next(ai)) {
-        /* Admitedly, these checks are quite paranoid, we should
-           not get anything in the BIO_ADDRINFO chain that we haven't
-           asked for */
+        /* Admittedly, these checks are quite paranoid, we should not get
+         * anything in the BIO_ADDRINFO chain that we haven't
+         * asked for. */
         OPENSSL_assert((family == AF_UNSPEC || family == BIO_ADDRINFO_family(res))
                        && (type == 0 || type == BIO_ADDRINFO_socktype(res)));
 
@@ -238,9 +238,8 @@ int do_server(int *accept_sock, const char *host, const char *port,
         return 0;
     }
 
-    /* Admitedly, these checks are quite paranoid, we should
-       not get anything in the BIO_ADDRINFO chain that we haven't
-       asked for */
+    /* Admittedly, these checks are quite paranoid, we should not get
+     * anything in the BIO_ADDRINFO chain that we haven't asked for */
     OPENSSL_assert((family == AF_UNSPEC || family == BIO_ADDRINFO_family(res))
                    && (type == 0 || type == BIO_ADDRINFO_socktype(res)));