Encapsulate SSL3_BUFFER and all access to s->s3->rbuf. (28d59af8) · Commits · CYBER - Cyber Security / TS 103 523 MSP / TLMSP / TLMSP OpenSSL

ssl/Makefile

+4 −2

Original line number	Diff line number	Diff line
		@@ -29,7 +29,8 @@ LIBSRC= \
		ssl_lib.c ssl_err2.c ssl_cert.c ssl_sess.c \
		ssl_ciph.c ssl_stat.c ssl_rsa.c \
		ssl_asn1.c ssl_txt.c ssl_algs.c ssl_conf.c \
		bio_ssl.c ssl_err.c kssl.c t1_reneg.c tls_srp.c t1_trce.c ssl_utst.c
		bio_ssl.c ssl_err.c kssl.c t1_reneg.c tls_srp.c t1_trce.c ssl_utst.c \
		record/ssl3_buffer.c
		LIBOBJ= \
		s3_meth.o s3_srvr.o s3_clnt.o s3_lib.o s3_enc.o s3_pkt.o s3_both.o s3_cbc.o \
		s23_meth.o s23_srvr.o s23_clnt.o s23_lib.o s23_pkt.o \
		@@ -39,7 +40,8 @@ LIBOBJ= \
		ssl_lib.o ssl_err2.o ssl_cert.o ssl_sess.o \
		ssl_ciph.o ssl_stat.o ssl_rsa.o \
		ssl_asn1.o ssl_txt.o ssl_algs.o ssl_conf.o \
		bio_ssl.o ssl_err.o kssl.o t1_reneg.o tls_srp.o t1_trce.o ssl_utst.o
		bio_ssl.o ssl_err.o kssl.o t1_reneg.o tls_srp.o t1_trce.o ssl_utst.o \
		record/ssl3_buffer.o

		SRC= $(LIBSRC)

ssl/d1_pkt.c

+17 −9

Original line number	Diff line number	Diff line
		@@ -198,12 +198,12 @@ static int dtls1_copy_record(SSL s, pitem item)

		rdata = (DTLS1_RECORD_DATA *)item->data;

		if (s->s3->rbuf.buf != NULL)
		OPENSSL_free(s->s3->rbuf.buf);
		SSL3_BUFFER_release(RECORD_LAYER_get_rbuf(&s->rlayer));

		s->packet = rdata->packet;
		s->packet_length = rdata->packet_length;
		memcpy(&(s->s3->rbuf), &(rdata->rbuf), sizeof(SSL3_BUFFER));
		memcpy(RECORD_LAYER_get_rbuf(&s->rlayer), &(rdata->rbuf),
		sizeof(SSL3_BUFFER));
		memcpy(&(s->s3->rrec), &(rdata->rrec), sizeof(SSL3_RECORD));

		/* Set proper sequence number for mac calculation */
		@@ -236,7 +236,8 @@ dtls1_buffer_record(SSL s, record_pqueue queue, unsigned char *priority)

		rdata->packet = s->packet;
		rdata->packet_length = s->packet_length;
		memcpy(&(rdata->rbuf), &(s->s3->rbuf), sizeof(SSL3_BUFFER));
		memcpy(&(rdata->rbuf), RECORD_LAYER_get_rbuf(&s->rlayer),
		sizeof(SSL3_BUFFER));
		memcpy(&(rdata->rrec), &(s->s3->rrec), sizeof(SSL3_RECORD));

		item->data = rdata;
		@@ -253,7 +254,7 @@ dtls1_buffer_record(SSL s, record_pqueue queue, unsigned char *priority)

		s->packet = NULL;
		s->packet_length = 0;
		memset(&(s->s3->rbuf), 0, sizeof(SSL3_BUFFER));
		memset(RECORD_LAYER_get_rbuf(&s->rlayer), 0, sizeof(SSL3_BUFFER));
		memset(&(s->s3->rrec), 0, sizeof(SSL3_RECORD));

		if (!ssl3_setup_buffers(s)) {
		@@ -544,7 +545,8 @@ int dtls1_get_record(SSL *s)
		/* check if we have the header */
		if ((s->rstate != SSL_ST_READ_BODY) \|\|
		(s->packet_length < DTLS1_RT_HEADER_LENGTH)) {
		n = ssl3_read_n(s, DTLS1_RT_HEADER_LENGTH, s->s3->rbuf.len, 0);
		n = ssl3_read_n(s, DTLS1_RT_HEADER_LENGTH,
		SSL3_BUFFER_get_len(RECORD_LAYER_get_rbuf(&s->rlayer)), 0);
		/* read timeout is handled by dtls1_read_bytes */
		if (n <= 0)
		return (n); /* error or non-blocking */
		@@ -722,9 +724,11 @@ int dtls1_read_bytes(SSL s, int type, unsigned char buf, int len, int peek)
		SSL3_RECORD *rr;
		void (cb) (const SSL ssl, int type2, int val) = NULL;

		if (s->s3->rbuf.buf == NULL) /* Not initialized yet */
		if (!SSL3_BUFFER_is_initialised(RECORD_LAYER_get_rbuf(&s->rlayer))) {
		/* Not initialized yet */
		if (!ssl3_setup_buffers(s))
		return (-1);
		}

		if ((type && (type != SSL3_RT_APPLICATION_DATA) &&
		(type != SSL3_RT_HANDSHAKE)) \|\|
		@@ -1047,7 +1051,9 @@ int dtls1_read_bytes(SSL s, int type, unsigned char buf, int len, int peek)
		}

		if (!(s->mode & SSL_MODE_AUTO_RETRY)) {
		if (s->s3->rbuf.left == 0) { /* no read-ahead left? */
		if (SSL3_BUFFER_get_left(
		RECORD_LAYER_get_rbuf(&s->rlayer)) == 0) {
		/* no read-ahead left? */
		BIO *bio;
		/*
		* In the case where we try to read application data,
		@@ -1269,7 +1275,9 @@ int dtls1_read_bytes(SSL s, int type, unsigned char buf, int len, int peek)
		}

		if (!(s->mode & SSL_MODE_AUTO_RETRY)) {
		if (s->s3->rbuf.left == 0) { /* no read-ahead left? */
		if (SSL3_BUFFER_get_left(
		RECORD_LAYER_get_rbuf(&s->rlayer)) == 0) {
		/* no read-ahead left? */
		BIO *bio;
		/*
		* In the case where we try to read application data, but we

ssl/record/rec_layer.h

+4 −0

Original line number	Diff line number	Diff line
		@@ -110,6 +110,8 @@
		*/

		typedef struct record_layer_st {
		/* The parent SSL structure */
		SSL *s;
		/*
		* Read as many input bytes as possible (for
		* non-blocking reads)
		@@ -117,5 +119,7 @@ typedef struct record_layer_st {
		int read_ahead;
		} RECORD_LAYER;

		#define RECORD_LAYER_set_ssl(rl, s) ((rl)->s = (s))
		#define RECORD_LAYER_set_read_ahead(rl, ra) ((rl)->read_ahead = (ra))
		#define RECORD_LAYER_get_read_ahead(rl) ((rl)->read_ahead)
		#define RECORD_LAYER_get_rbuf(rl) (&(rl)->s->s3->rbuf)

ssl/record/ssl3_buffer.c

0 → 100644

+127 −0

Original line number	Diff line number	Diff line
		/* ssl/record/ssl3_buffer.c */
		/* 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).
		*
		*/

		#include "../ssl_locl.h"

		void SSL3_BUFFER_set_data(SSL3_BUFFER b, unsigned char d, int n)
		{
		if(d != NULL)
		memcpy(b->buf, d, n);
		b->left = n;
		b->offset = 0;
		}

		void SSL3_BUFFER_release(SSL3_BUFFER *b)
		{
		if (b->buf != NULL)
		OPENSSL_free(b->buf);
		b->buf = NULL;
		}

ssl/record/ssl3_buffer.h

0 → 100644

+132 −0

Original line number	Diff line number	Diff line
		/* ssl/record/ssl3_buffer.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 ssl3_buffer_st {
		/* at least SSL3_RT_MAX_PACKET_SIZE bytes, see ssl3_setup_buffers() */
		unsigned char *buf;
		/* buffer size */
		size_t len;
		/* where to 'copy from' */
		int offset;
		/* how many bytes left */
		int left;
		} SSL3_BUFFER;

		#define SSL3_BUFFER_get_buf(b) ((b)->buf)
		#define SSL3_BUFFER_set_buf(b, n) ((b)->buf = (n))
		#define SSL3_BUFFER_get_len(b) ((b)->len)
		#define SSL3_BUFFER_set_len(b, l) ((b)->len = (l))
		#define SSL3_BUFFER_get_left(b) ((b)->left)
		#define SSL3_BUFFER_is_initialised(b) ((b)->buf != NULL)

		void SSL3_BUFFER_set_data(SSL3_BUFFER b, unsigned char d, int n);
		void SSL3_BUFFER_release(SSL3_BUFFER *b);

Admin message