Reorganise header files (44cc35d3) · Commits · CYBER - Cyber Security / TS 103 523 MSP / TLMSP / TLMSP OpenSSL

ssl/record/d1_pkt.c

+6 −1

Original line number	Diff line number	Diff line
		@@ -121,7 +121,7 @@
		#include <openssl/buffer.h>
		#include <openssl/pqueue.h>
		#include <openssl/rand.h>

		#include "rec_layer_locl.h"

		int DTLS_RECORD_LAYER_new(RECORD_LAYER *rl)
		{
		@@ -231,6 +231,11 @@ void DTLS_RECORD_LAYER_set_saved_w_epoch(RECORD_LAYER *rl, unsigned short e)
		rl->d->w_epoch = e;
		}

		void DTLS_RECORD_LAYER_resync_write(RECORD_LAYER *rl)
		{
		memcpy(rl->write_sequence, rl->read_sequence, sizeof(rl->write_sequence));
		}

		static int have_handshake_fragment(SSL s, int type, unsigned char buf,
		int len, int peek);

ssl/record/dtls1_bitmap.h

deleted100644 → 0

+0 −122

Original line number	Diff line number	Diff line
		/* ssl/record/dtls1_bitmap.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-2015 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 dtls1_bitmap_st {
		unsigned long map; /* track 32 packets on 32-bit systems and 64
		* - on 64-bit systems */

		unsigned char max_seq_num[8]; /* max record number seen so far, 64-bit
		* value in big-endian encoding */
		} DTLS1_BITMAP;

		int dtls1_record_replay_check(SSL s, DTLS1_BITMAP bitmap);
		void dtls1_record_bitmap_update(SSL s, DTLS1_BITMAP bitmap);

ssl/record/rec_layer.h

+84 −41

Original line number	Diff line number	Diff line
		@@ -56,7 +56,7 @@
		* [including the GNU Public Licence.]
		*/
		/* ====================================================================
		* Copyright (c) 1998-2002 The OpenSSL Project. All rights reserved.
		* Copyright (c) 1998-2015 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
		@@ -109,16 +109,74 @@
		*
		*/

		#include "../ssl_locl.h"

		/*****************************************************************************
		* *
		* These structures should be considered "opaque" to anything outside of the *
		* record layer. No non-record layer code should be accessing the members of *
		* these structures. *
		* These structures should be considered PRIVATE to the record layer. No *
		* non-record layer code should be using these structures in any way. *
		* *
		*****************************************************************************/

		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;

		typedef struct ssl3_record_st {
		/* type of record */
		/*
		* r
		*/ int type;
		/* How many bytes available */
		/*
		* rw
		*/ unsigned int length;
		/*
		* How many bytes were available before padding was removed? This is used
		* to implement the MAC check in constant time for CBC records.
		*/
		/*
		* rw
		*/ unsigned int orig_len;
		/* read/write offset into 'buf' */
		/*
		* r
		*/ unsigned int off;
		/* pointer to the record data */
		/*
		* rw
		/ unsigned char data;
		/* where the decode bytes are */
		/*
		* rw
		/ unsigned char input;
		/* only used with decompression - malloc()ed */
		/*
		* r
		/ unsigned char comp;
		/* epoch number, needed by DTLS1 */
		/*
		* r
		*/ unsigned long epoch;
		/* sequence number, needed by DTLS1 */
		/*
		* r
		*/ unsigned char seq_num[8];
		} SSL3_RECORD;

		typedef struct dtls1_bitmap_st {
		unsigned long map; /* track 32 packets on 32-bit systems and 64
		* - on 64-bit systems */

		unsigned char max_seq_num[8]; /* max record number seen so far, 64-bit
		* value in big-endian encoding */
		} DTLS1_BITMAP;

		typedef struct record_pqueue_st {
		unsigned short epoch;
		pqueue q;
		@@ -134,6 +192,7 @@ typedef struct dtls1_record_data_st {
		# endif
		} DTLS1_RECORD_DATA;


		typedef struct dtls_record_layer_st {
		/*
		* The current data and handshake epoch. This is initially
		@@ -171,6 +230,14 @@ typedef struct dtls_record_layer_st {
		unsigned char curr_write_sequence[8];
		} DTLS_RECORD_LAYER;

		/*****************************************************************************
		* *
		* This structure should be considered "opaque" to anything outside of the *
		* record layer. No non-record layer code should be accessing the members of *
		* this structure. *
		* *
		*****************************************************************************/

		typedef struct record_layer_st {
		/* The parent SSL structure */
		SSL *s;
		@@ -224,13 +291,12 @@ typedef struct record_layer_st {
		/*****************************************************************************
		* *
		* The following macros/functions represent the libssl internal API to the *
		* record layer. *
		* record layer. Any libssl code may call these functions/macros *
		* *
		*****************************************************************************/

		#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_setup_comp_buffer(rl) (SSL3_RECORD_setup(&(rl)->rrec))
		#define RECORD_LAYER_get_packet(rl) ((rl)->packet)
		#define RECORD_LAYER_get_packet_length(rl) ((rl)->packet_length)
		#define RECORD_LAYER_add_packet_length(rl, inc) ((rl)->packet_length += (inc))
		@@ -239,8 +305,6 @@ typedef struct record_layer_st {
		((rl)->d->processed_rcds)
		#define DTLS_RECORD_LAYER_get_unprocessed_rcds(rl) \
		((rl)->d->unprocessed_rcds)
		#define DTLS_RECORD_LAYER_resync_write(rl) \
		RECORD_LAYER_set_write_sequence((rl), (rl)->read_sequence)

		void RECORD_LAYER_init(RECORD_LAYER rl, SSL s);
		void RECORD_LAYER_clear(RECORD_LAYER *rl);
		@@ -251,6 +315,7 @@ int RECORD_LAYER_set_data(RECORD_LAYER rl, const unsigned char buf, int len);
		void RECORD_LAYER_dup(RECORD_LAYER dst, RECORD_LAYER src);
		void RECORD_LAYER_reset_read_sequence(RECORD_LAYER *rl);
		void RECORD_LAYER_reset_write_sequence(RECORD_LAYER *rl);
		int RECORD_LAYER_setup_comp_buffer(RECORD_LAYER *rl);
		__owur int ssl3_pending(const SSL *s);
		__owur int ssl23_read_bytes(SSL *s, int n);
		__owur int ssl23_write_bytes(SSL *s);
		@@ -258,44 +323,22 @@ __owur int ssl3_write_bytes(SSL s, int type, const void buf, int len);
		__owur int do_ssl3_write(SSL s, int type, const unsigned char buf,
		unsigned int len, int create_empty_fragment);
		__owur int ssl3_read_bytes(SSL s, int type, unsigned char buf, int len, int peek);
		__owur int ssl3_setup_buffers(SSL *s);
		__owur int ssl3_enc(SSL *s, int send_data);
		__owur int n_ssl3_mac(SSL ssl, unsigned char md, int send_data);
		__owur int ssl3_write_pending(SSL s, int type, const unsigned char buf,
		unsigned int len);
		__owur int tls1_enc(SSL *s, int snd);
		__owur int tls1_mac(SSL ssl, unsigned char md, int snd);
		int DTLS_RECORD_LAYER_new(RECORD_LAYER *rl);
		void DTLS_RECORD_LAYER_free(RECORD_LAYER *rl);
		void DTLS_RECORD_LAYER_clear(RECORD_LAYER *rl);
		void DTLS_RECORD_LAYER_set_saved_w_epoch(RECORD_LAYER *rl, unsigned short e);
		void DTLS_RECORD_LAYER_clear(RECORD_LAYER *rl);
		void DTLS_RECORD_LAYER_resync_write(RECORD_LAYER *rl);
		__owur int dtls1_read_bytes(SSL s, int type, unsigned char buf, int len, int peek);
		__owur int dtls1_write_bytes(SSL s, int type, const void buf, int len);
		__owur int do_dtls1_write(SSL s, int type, const unsigned char buf,
		unsigned int len, int create_empty_fragement);
		void dtls1_reset_seq_numbers(SSL *s, int rw);


		/*****************************************************************************
		* *
		* The following macros/functions are private to the record layer. They *
		* should not be used outside of the record layer. *
		* *
		*****************************************************************************/

		#define RECORD_LAYER_get_rbuf(rl) (&(rl)->rbuf)
		#define RECORD_LAYER_get_wbuf(rl) (&(rl)->wbuf)
		#define RECORD_LAYER_get_rrec(rl) (&(rl)->rrec)
		#define RECORD_LAYER_get_wrec(rl) (&(rl)->wrec)
		#define RECORD_LAYER_set_packet(rl, p) ((rl)->packet = (p))
		#define RECORD_LAYER_reset_packet_length(rl) ((rl)->packet_length = 0)
		#define RECORD_LAYER_get_rstate(rl) ((rl)->rstate)
		#define RECORD_LAYER_set_rstate(rl, st) ((rl)->rstate = (st))
		#define RECORD_LAYER_get_read_sequence(rl) ((rl)->read_sequence)
		#define RECORD_LAYER_get_write_sequence(rl) ((rl)->write_sequence)
		#define DTLS_RECORD_LAYER_get_r_epoch(rl) ((rl)->d->r_epoch)

		__owur int ssl3_read_n(SSL *s, int n, int max, int extend);
		__owur int ssl3_write_pending(SSL s, int type, const unsigned char buf,
		unsigned int len);
		void RECORD_LAYER_set_write_sequence(RECORD_LAYER rl, const unsigned char ws);
		DTLS1_BITMAP dtls1_get_bitmap(SSL s, SSL3_RECORD *rr,
		unsigned int *is_next_epoch);
		int dtls1_process_buffered_records(SSL *s);
		int dtls1_retrieve_buffered_record(SSL s, record_pqueue queue);
		int dtls1_buffer_record(SSL s, record_pqueue q,
		unsigned char *priority);
		void ssl3_record_sequence_update(unsigned char *seq);

ssl/record/ssl3_record.h→ssl/record/rec_layer_locl.h

+57 −46

Original line number	Diff line number	Diff line
		/* ssl/record/ssl3_record.h */
		/* ssl/record/rec_layer_locl.h */
		/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
		* All rights reserved.
		*
		@@ -109,47 +109,62 @@
		*
		*/

		typedef struct ssl3_record_st {
		/* type of record */
		/*
		* r
		*/ int type;
		/* How many bytes available */
		/*
		* rw
		*/ unsigned int length;
		/*
		* How many bytes were available before padding was removed? This is used
		* to implement the MAC check in constant time for CBC records.
		*/
		/*
		* rw
		*/ unsigned int orig_len;
		/* read/write offset into 'buf' */
		/*
		* r
		*/ unsigned int off;
		/* pointer to the record data */
		/*
		* rw
		/ unsigned char data;
		/* where the decode bytes are */
		/*
		* rw
		/ unsigned char input;
		/* only used with decompression - malloc()ed */
		/*
		* r
		/ unsigned char comp;
		/* epoch number, needed by DTLS1 */
		/*
		* r
		*/ unsigned long epoch;
		/* sequence number, needed by DTLS1 */
		/*
		* r
		*/ unsigned char seq_num[8];
		} SSL3_RECORD;

		/*****************************************************************************
		* *
		* The following macros/functions are PRIVATE to the record layer. They *
		* should NOT be used outside of the record layer. *
		* *
		*****************************************************************************/

		/* Functions/macros provided by the RECORD_LAYER component */

		#define RECORD_LAYER_get_rbuf(rl) (&(rl)->rbuf)
		#define RECORD_LAYER_get_wbuf(rl) (&(rl)->wbuf)
		#define RECORD_LAYER_get_rrec(rl) (&(rl)->rrec)
		#define RECORD_LAYER_get_wrec(rl) (&(rl)->wrec)
		#define RECORD_LAYER_set_packet(rl, p) ((rl)->packet = (p))
		#define RECORD_LAYER_reset_packet_length(rl) ((rl)->packet_length = 0)
		#define RECORD_LAYER_get_rstate(rl) ((rl)->rstate)
		#define RECORD_LAYER_set_rstate(rl, st) ((rl)->rstate = (st))
		#define RECORD_LAYER_get_read_sequence(rl) ((rl)->read_sequence)
		#define RECORD_LAYER_get_write_sequence(rl) ((rl)->write_sequence)
		#define DTLS_RECORD_LAYER_get_r_epoch(rl) ((rl)->d->r_epoch)

		__owur int ssl3_read_n(SSL *s, int n, int max, int extend);

		void RECORD_LAYER_set_write_sequence(RECORD_LAYER rl, const unsigned char ws);
		DTLS1_BITMAP dtls1_get_bitmap(SSL s, SSL3_RECORD *rr,
		unsigned int *is_next_epoch);
		int dtls1_process_buffered_records(SSL *s);
		int dtls1_retrieve_buffered_record(SSL s, record_pqueue queue);
		int dtls1_buffer_record(SSL s, record_pqueue q,
		unsigned char *priority);
		void ssl3_record_sequence_update(unsigned char *seq);

		/* Functions provided by the DTLS1_BITMAP component */

		int dtls1_record_replay_check(SSL s, DTLS1_BITMAP bitmap);
		void dtls1_record_bitmap_update(SSL s, DTLS1_BITMAP bitmap);


		/* Macros/functions provided by the SSL3_BUFFER component */

		#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, const unsigned char d, int n);
		void SSL3_BUFFER_release(SSL3_BUFFER *b);
		__owur int ssl3_setup_read_buffer(SSL *s);
		__owur int ssl3_setup_write_buffer(SSL *s);
		int ssl3_release_read_buffer(SSL *s);
		int ssl3_release_write_buffer(SSL *s);

		/* Macros/functions provided by the SSL3_RECORD component */

		#define SSL3_RECORD_get_type(r) ((r)->type)
		#define SSL3_RECORD_get_length(r) ((r)->length)
		@@ -163,10 +178,6 @@ void SSL3_RECORD_set_seq_num(SSL3_RECORD r, const unsigned char seq_num);
		int ssl3_get_record(SSL *s);
		__owur int ssl3_do_compress(SSL *ssl);
		__owur int ssl3_do_uncompress(SSL *ssl);
		__owur int ssl3_enc(SSL *s, int send_data);
		__owur int n_ssl3_mac(SSL ssl, unsigned char md, int send_data);
		__owur int tls1_enc(SSL *s, int snd);
		__owur int tls1_mac(SSL ssl, unsigned char md, int snd);
		void ssl3_cbc_copy_mac(unsigned char *out,
		const SSL3_RECORD *rec, unsigned md_size);
		__owur int ssl3_cbc_remove_padding(const SSL *s,

ssl/record/s3_pkt.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -117,6 +117,7 @@
		#include <openssl/evp.h>
		#include <openssl/buffer.h>
		#include <openssl/rand.h>
		#include "rec_layer_locl.h"

		#ifndef EVP_CIPH_FLAG_TLS1_1_MULTIBLOCK
		# define EVP_CIPH_FLAG_TLS1_1_MULTIBLOCK 0
		@@ -227,9 +228,9 @@ void RECORD_LAYER_reset_write_sequence(RECORD_LAYER *rl)
		memset(rl->write_sequence, 0, 8);
		}

		void RECORD_LAYER_set_write_sequence(RECORD_LAYER rl, const unsigned char ws)
		int RECORD_LAYER_setup_comp_buffer(RECORD_LAYER *rl)
		{
		memcpy(rl->write_sequence, ws, sizeof(rl->write_sequence));
		return SSL3_RECORD_setup(&(rl)->rrec);
		}

		int ssl3_pending(const SSL *s)