Commit 3519bae5 authored by Xiaoyin Liu's avatar Xiaoyin Liu Committed by Rich Salz
Browse files

Fix typos in files in ssl directory 



Reviewed-by: default avatarTim Hudson <tjh@openssl.org>
Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4052)
parent 1c026996

ssl/record/rec_layer_s3.c

+2 −2
Original line number Diff line number Diff line
@@ -347,7 +347,7 @@ int ssl3_write_bytes(SSL *s, int type, const void *buf_, size_t len, 
    tot = s->rlayer.wnum;

    /*

     * ensure that if we end up with a smaller value of data to write out

     * than the the original len from a write which didn't complete for

     * than the original len from a write which didn't complete for

     * non-blocking I/O and also somehow ended up avoiding the check for

     * this in ssl3_write_pending/SSL_R_BAD_WRITE_RETRY as it must never be

     * possible to end up with (len-tot) as a large number that will then
@@ -942,7 +942,7 @@ int do_ssl3_write(SSL *s, int type, const unsigned char *buf, 
            || s->early_data_state == SSL_EARLY_DATA_WRITE_RETRY) {

        /*

         * We haven't actually negotiated the version yet, but we're trying to

         * send early data - so we need to use the the tls13enc function.

         * send early data - so we need to use the tls13enc function.

         */

        if (tls13_enc(s, wr, numpipes, 1) < 1)

            goto err;

ssl/s3_cbc.c

+2 −2
Original line number Diff line number Diff line
@@ -419,8 +419,8 @@ int ssl3_cbc_digest_record(const EVP_MD_CTX *ctx, 
             */

            b = constant_time_select_8(is_past_c, 0x80, b);

            /*

             * If this the the block containing the end of the application

             * data and we're past the 0x80 value then just write zero.

             * If this block contains the end of the application data

             * and we're past the 0x80 value then just write zero.

             */

            b = b & ~is_past_cp1;

            /*

ssl/s3_lib.c

+1 −1
Original line number Diff line number Diff line
@@ -3790,7 +3790,7 @@ const SSL_CIPHER *ssl3_get_cipher_by_std_name(const char *stdname) 
    SSL_CIPHER *tbl = ssl3_ciphers;

    size_t i;



    /* this is not efficient, necessary to optimze this? */

    /* this is not efficient, necessary to optimize this? */

    for (i = 0; i < SSL3_NUM_CIPHERS; i++, tbl++) {

        if (tbl->stdname == NULL)

            continue;

ssl/ssl_ciph.c

+1 −1
Original line number Diff line number Diff line
@@ -1365,7 +1365,7 @@ STACK_OF(SSL_CIPHER) *ssl_create_cipher_list(const SSL_METHOD *ssl_method, STACK 
    ssl_cipher_apply_rule(0, SSL_kPSK, 0, 0, 0, 0, 0, CIPHER_ORD, -1, &head,

                          &tail);



    /* RC4 is sort-of broken -- move the the end */

    /* RC4 is sort-of broken -- move to the end */

    ssl_cipher_apply_rule(0, 0, 0, SSL_RC4, 0, 0, 0, CIPHER_ORD, -1, &head,

                          &tail);