Commit 1f5b44e9 authored by Matt Caswell's avatar Matt Caswell
Browse files

Miscellaneous style tweaks based on feedback received 



Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2259)
parent 6df55cac

apps/s_client.c

+3 −3
Original line number Diff line number Diff line
@@ -784,11 +784,11 @@ static int new_session_cb(SSL *S, SSL_SESSION *sess) 
{

    BIO *stmp = BIO_new_file(sess_out, "w");



    if (stmp != NULL) {

    if (stmp == NULL) {

        BIO_printf(bio_err, "Error writing session file %s\n", sess_out);

    } else {

        PEM_write_bio_SSL_SESSION(stmp, sess);

        BIO_free(stmp);

    } else {

        BIO_printf(bio_err, "Error writing session file %s\n", sess_out);

    }



    /*

include/openssl/ssl3.h

+3 −0
Original line number Diff line number Diff line
@@ -25,6 +25,9 @@ 
extern "C" {

#endif



/* Flag used on OpenSSL ciphersuite ids to indicate they are for SSLv3+ */

# define SSL3_CK_CIPHERSUITE_FLAG                0x03000000



/*

 * Signalling cipher suite value from RFC 5746

 * (TLS_EMPTY_RENEGOTIATION_INFO_SCSV)

ssl/packet_locl.h

+3 −3
Original line number Diff line number Diff line
@@ -700,11 +700,11 @@ int WPACKET_close(WPACKET *pkt); 
int WPACKET_finish(WPACKET *pkt);



/*

 * Iterates through all the sub-packets and writes out their lengths as if they

 * Iterate through all the sub-packets and write out their lengths as if they

 * were being closed. The lengths will be overwritten with the final lengths

 * when the sub-packets are eventually closed (which may be different if more

 * data is added to the WPACKET). This function will fail if a sub-packet is of

 * 0 length and WPACKET_FLAGS_ABANDON_ON_ZERO_LENGTH is used.

 * data is added to the WPACKET). This function fails if a sub-packet is of 0

 * length and WPACKET_FLAGS_ABANDON_ON_ZERO_LENGTH is set.

 */

int WPACKET_fill_lengths(WPACKET *pkt);

ssl/s3_lib.c

+1 −1
Original line number Diff line number Diff line
@@ -3559,7 +3559,7 @@ const SSL_CIPHER *ssl3_get_cipher_by_id(uint32_t id) 
 */

const SSL_CIPHER *ssl3_get_cipher_by_char(const unsigned char *p)

{

    return ssl3_get_cipher_by_id(0x03000000

    return ssl3_get_cipher_by_id(SSL3_CK_CIPHERSUITE_FLAG

                                 | ((uint32_t)p[0] << 8L)

                                 | (uint32_t)p[1]);

}

ssl/ssl_sess.c

+1 −2
Original line number Diff line number Diff line
@@ -620,13 +620,12 @@ int ssl_get_prev_session(SSL *s, CLIENTHELLO_MSG *hello) 


    s->session_ctx->stats.sess_hit++;

    s->verify_result = s->session->verify_result;



    return 1;



 err:

    if (ret != NULL) {

        SSL_SESSION_free(ret);

        /* In TLSv1.3 we already set s->session, so better NULL it out */

        /* In TLSv1.3 s->session was already set to ret, so we NULL it out */

        if (SSL_IS_TLS13(s))

            s->session = NULL;