update NEWS with v3_scts.c issue

[openssl.git] / ssl / s3_srvr.c

diff --git a/ssl/s3_srvr.c b/ssl/s3_srvr.c
index ae3a34894322799498992cbdf4fc7a66cbc33950..bea6e2750bd3bebbdd7260e9f8dbc073e1fd2632 100644 (file)
--- a/ssl/s3_srvr.c
+++ b/ssl/s3_srvr.c
@@ -903,9 +903,7 @@ int ssl3_check_client_hello(SSL *s)
        s->s3->tmp.reuse_message = 1;
 #ifndef OPENSSL_NO_TLSEXT
        if (s->s3->tmp.message_type == SSL3_MT_SUPPLEMENTAL_DATA)
-               {
                return 3;
-               }
 #endif
        if (s->s3->tmp.message_type == SSL3_MT_CLIENT_HELLO)
                {
@@ -3676,8 +3674,7 @@ int tls1_send_server_supplemental_data(SSL *s, int *skip)
                        if (!record->fn1)
                                continue;
                        cb_retval = record->fn1(s, record->supp_data_type,
-                                                                       &out, &outlen, &al,
-                       record->arg);
+                                               &out, &outlen, &al, record->arg);
                        if (cb_retval == -1)
                                continue; /* skip this supp data entry */
                        if (cb_retval == 0)
@@ -3690,12 +3687,13 @@ int tls1_send_server_supplemental_data(SSL *s, int *skip)
                                SSLerr(SSL_F_TLS1_SEND_SERVER_SUPPLEMENTAL_DATA,ERR_R_BUF_LIB);
                                return 0;
                                }
-                       //write supp data entry...
-                       //if first entry, write handshake message type
-                       //jump back to write length at end
+                       /* write supp data entry...
+                        * if first entry, write handshake message type
+                        * jump back to write length at end */
                        if (length == 0)
                                {
-                               //1 byte message type + 3 bytes for message length
+                               /* 1 byte message type + 3 bytes for
+                                * message length */
                                if (!BUF_MEM_grow_clean(s->init_buf, 4))
                                        {
                                        SSLerr(SSL_F_TLS1_SEND_SERVER_SUPPLEMENTAL_DATA,ERR_R_BUF_LIB);
@@ -3703,13 +3701,15 @@ int tls1_send_server_supplemental_data(SSL *s, int *skip)
                                        }
                                p = (unsigned char *)s->init_buf->data;
                                *(p++) = SSL3_MT_SUPPLEMENTAL_DATA;
-                               //hold on to length field to update later
+                               /* hold on to length field to update later */
                                size_loc = p;
-                               //skip over handshake length field (3 bytes) and supp_data length field (3 bytes)
+                               /* skip over handshake length field (3
+                                * bytes) and supp_data length field
+                                * (3 bytes) */
                                p += 3 + 3;
                                length += 1 +3 +3;
                                }
-                       //2 byte supp data type + 2 byte length + outlen
+                       /* 2 byte supp data type + 2 byte length + outlen */
                        if (!BUF_MEM_grow(s->init_buf, outlen + 4))
                                {
                                SSLerr(SSL_F_TLS1_SEND_SERVER_SUPPLEMENTAL_DATA,ERR_R_BUF_LIB);
@@ -3718,15 +3718,16 @@ int tls1_send_server_supplemental_data(SSL *s, int *skip)
                        s2n(record->supp_data_type, p);
                        s2n(outlen, p);
                        memcpy(p, out, outlen);
-                       //update length to supp data type (2 bytes) + supp data length (2 bytes) + supp data
+                       /* update length to supp data type (2 bytes) +
+                        * supp data length (2 bytes) + supp data */
                        length += (outlen + 4);
                        p += outlen;
                        }
                if (length > 0)
                        {
-                       //write handshake length
+                       /* write handshake length */
                        l2n3(length - 4, size_loc);
-                       //supp_data length
+                       /* supp_data length */
                        l2n3(length - 7, size_loc);
                        s->state = SSL3_ST_SW_SUPPLEMENTAL_DATA_B;
                        s->init_num = length;
@@ -3736,7 +3737,7 @@ int tls1_send_server_supplemental_data(SSL *s, int *skip)
                        }
                }
 
-       //no supp data message sent
+       /* no supp data message sent */
        *skip = 1;
        s->init_num = 0;
        s->init_off = 0;
@@ -3754,17 +3755,17 @@ int tls1_get_client_supplemental_data(SSL *s)
        long n;
        const unsigned char *p, *d;
        unsigned short supp_data_entry_type = 0;
-       unsigned long supp_data_entry_len = 0;
+       unsigned short supp_data_entry_len = 0;
        unsigned long supp_data_len = 0;
        size_t i = 0;
 
        n=s->method->ssl_get_message(s,
-                                                                SSL3_ST_SR_SUPPLEMENTAL_DATA_A,
-                                                                SSL3_ST_SR_SUPPLEMENTAL_DATA_B,
-                                                                SSL3_MT_SUPPLEMENTAL_DATA,
-                                                                /* use default limit */
-                                                                TLSEXT_MAXLEN_supplemental_data,
-                                                                &ok);
+                                    SSL3_ST_SR_SUPPLEMENTAL_DATA_A,
+                                    SSL3_ST_SR_SUPPLEMENTAL_DATA_B,
+                                    SSL3_MT_SUPPLEMENTAL_DATA,
+                                    /* use default limit */
+                                    TLSEXT_MAXLEN_supplemental_data,
+                                    &ok);
 
        if (!ok) return((int)n);
 
@@ -3783,7 +3784,7 @@ int tls1_get_client_supplemental_data(SSL *s)
                {
                n2s(p, supp_data_entry_type);
                n2s(p, supp_data_entry_len);
-               //if there is a callback for this supp data type, send it
+               /* if there is a callback for this supp data type, send it */
                for (i=0; i < s->ctx->srv_supp_data_records_count; i++)
                        {
                        if (s->ctx->srv_supp_data_records[i].supp_data_type == supp_data_entry_type && s->ctx->srv_supp_data_records[i].fn2)