Commit 52e1d7b1 authored by Matt Caswell's avatar Matt Caswell
Browse files

Create a RECORD_LAYER structure and move read_ahead into it. 



Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
parent 8e3f0c98

ssl/record/rec_layer.h

0 → 100644
+121 −0
Original line number Diff line number Diff line 
/* ssl/record/rec_layer.h */

/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)

 * All rights reserved.

 *

 * This package is an SSL implementation written

 * by Eric Young (eay@cryptsoft.com).

 * The implementation was written so as to conform with Netscapes SSL.

 *

 * This library is free for commercial and non-commercial use as long as

 * the following conditions are aheared to.  The following conditions

 * apply to all code found in this distribution, be it the RC4, RSA,

 * lhash, DES, etc., code; not just the SSL code.  The SSL documentation

 * included with this distribution is covered by the same copyright terms

 * except that the holder is Tim Hudson (tjh@cryptsoft.com).

 *

 * Copyright remains Eric Young's, and as such any Copyright notices in

 * the code are not to be removed.

 * If this package is used in a product, Eric Young should be given attribution

 * as the author of the parts of the library used.

 * This can be in the form of a textual message at program startup or

 * in documentation (online or textual) provided with the package.

 *

 * Redistribution and use in source and binary forms, with or without

 * modification, are permitted provided that the following conditions

 * are met:

 * 1. Redistributions of source code must retain the copyright

 *    notice, this list of conditions and the following disclaimer.

 * 2. Redistributions in binary form must reproduce the above copyright

 *    notice, this list of conditions and the following disclaimer in the

 *    documentation and/or other materials provided with the distribution.

 * 3. All advertising materials mentioning features or use of this software

 *    must display the following acknowledgement:

 *    "This product includes cryptographic software written by

 *     Eric Young (eay@cryptsoft.com)"

 *    The word 'cryptographic' can be left out if the rouines from the library

 *    being used are not cryptographic related :-).

 * 4. If you include any Windows specific code (or a derivative thereof) from

 *    the apps directory (application code) you must include an acknowledgement:

 *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"

 *

 * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND

 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE

 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE

 * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE

 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL

 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS

 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)

 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT

 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY

 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF

 * SUCH DAMAGE.

 *

 * The licence and distribution terms for any publically available version or

 * derivative of this code cannot be changed.  i.e. this code cannot simply be

 * copied and put under another distribution licence

 * [including the GNU Public Licence.]

 */

/* ====================================================================

 * Copyright (c) 1998-2002 The OpenSSL Project.  All rights reserved.

 *

 * Redistribution and use in source and binary forms, with or without

 * modification, are permitted provided that the following conditions

 * are met:

 *

 * 1. Redistributions of source code must retain the above copyright

 *    notice, this list of conditions and the following disclaimer.

 *

 * 2. Redistributions in binary form must reproduce the above copyright

 *    notice, this list of conditions and the following disclaimer in

 *    the documentation and/or other materials provided with the

 *    distribution.

 *

 * 3. All advertising materials mentioning features or use of this

 *    software must display the following acknowledgment:

 *    "This product includes software developed by the OpenSSL Project

 *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"

 *

 * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to

 *    endorse or promote products derived from this software without

 *    prior written permission. For written permission, please contact

 *    openssl-core@openssl.org.

 *

 * 5. Products derived from this software may not be called "OpenSSL"

 *    nor may "OpenSSL" appear in their names without prior written

 *    permission of the OpenSSL Project.

 *

 * 6. Redistributions of any form whatsoever must retain the following

 *    acknowledgment:

 *    "This product includes software developed by the OpenSSL Project

 *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"

 *

 * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY

 * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE

 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR

 * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR

 * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,

 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT

 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;

 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)

 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,

 * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)

 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED

 * OF THE POSSIBILITY OF SUCH DAMAGE.

 * ====================================================================

 *

 * This product includes cryptographic software written by Eric Young

 * (eay@cryptsoft.com).  This product includes software written by Tim

 * Hudson (tjh@cryptsoft.com).

 *

 */



typedef struct record_layer_st {

    /*

     * Read as many input bytes as possible (for

     * non-blocking reads)

     */

    int read_ahead;

} RECORD_LAYER;



#define RECORD_LAYER_set_read_ahead(rl, ra)     ((rl)->read_ahead = (ra))

#define RECORD_LAYER_get_read_ahead(rl)         ((rl)->read_ahead)

ssl/s3_pkt.c

+2 −2
Original line number Diff line number Diff line
@@ -142,7 +142,7 @@ int ssl3_read_n(SSL *s, int n, int max, int extend) 
     * If extend == 0, obtain new n-byte packet; if extend == 1, increase

     * packet by another n bytes. The packet will be in the sub-array of

     * s->s3->rbuf.buf specified by s->packet and s->packet_length. (If

     * s->read_ahead is set, 'max' bytes may be stored in rbuf [plus

     * s->rlayer.read_ahead is set, 'max' bytes may be stored in rbuf [plus

     * s->packet_length bytes if extend == 1].)

     */

    int i, len, left;
@@ -232,7 +232,7 @@ int ssl3_read_n(SSL *s, int n, int max, int extend) 
    }



    /* We always act like read_ahead is set for DTLS */

    if (!s->read_ahead && !SSL_IS_DTLS(s))

    if (!RECORD_LAYER_get_read_ahead(&s->rlayer) && !SSL_IS_DTLS(s))

        /* ignore max parameter */

        max = n;

    else {

ssl/ssl_lib.c

+6 −6
Original line number Diff line number Diff line
@@ -301,7 +301,7 @@ SSL *SSL_new(SSL_CTX *ctx) 
    if (s->cert == NULL)

        goto err;



    s->read_ahead = ctx->read_ahead;

    RECORD_LAYER_set_read_ahead(&s->rlayer, ctx->read_ahead);

    s->msg_callback = ctx->msg_callback;

    s->msg_callback_arg = ctx->msg_callback_arg;

    s->verify_mode = ctx->verify_mode;
@@ -821,12 +821,12 @@ void SSL_set_verify_depth(SSL *s, int depth) 


void SSL_set_read_ahead(SSL *s, int yes)

{

    s->read_ahead = yes;

    RECORD_LAYER_set_read_ahead(&s->rlayer, yes);

}



int SSL_get_read_ahead(const SSL *s)

{

    return (s->read_ahead);

    return RECORD_LAYER_get_read_ahead(&s->rlayer);

}



int SSL_pending(const SSL *s)
@@ -1063,10 +1063,10 @@ long SSL_ctrl(SSL *s, int cmd, long larg, void *parg) 


    switch (cmd) {

    case SSL_CTRL_GET_READ_AHEAD:

        return (s->read_ahead);

        return (RECORD_LAYER_get_read_ahead(&s->rlayer));

    case SSL_CTRL_SET_READ_AHEAD:

        l = s->read_ahead;

        s->read_ahead = larg;

        l = RECORD_LAYER_get_read_ahead(&s->rlayer);

        RECORD_LAYER_set_read_ahead(&s->rlayer, larg);

        return (l);



    case SSL_CTRL_SET_MSG_CALLBACK_ARG:

ssl/ssl_locl.h

+5 −2
Original line number Diff line number Diff line
@@ -165,6 +165,8 @@ 
# include <openssl/ssl.h>

# include <openssl/symhacks.h>



#include "record/rec_layer.h"



# ifdef OPENSSL_BUILD_SHLIBSSL

#  undef OPENSSL_EXTERN

#  define OPENSSL_EXTERN OPENSSL_EXPORT
@@ -977,6 +979,8 @@ struct ssl_st { 
    int type;

    /* SSLv3 */

    const SSL_METHOD *method;



    RECORD_LAYER rlayer;

    /*

     * There are 2 BIO's even though they are normally both the same.  This

     * is so data can be read and written to different handlers
@@ -1030,8 +1034,7 @@ struct ssl_st { 
    unsigned int packet_length;

    struct ssl3_state_st *s3;   /* SSLv3 variables */

    struct dtls1_state_st *d1;  /* DTLSv1 variables */

    int read_ahead;             /* Read as many input bytes as possible (for

                                 * non-blocking reads) */



    /* callback that allows applications to peek at protocol messages */

    void (*msg_callback) (int write_p, int version, int content_type,

                          const void *buf, size_t len, SSL *ssl, void *arg);