Move pqueue into ssl (cf2cede4) · Commits · CYBER - Cyber Security / TS 103 523 MSP / TLMSP / TLMSP OpenSSL

Makefile.in

+1 −1

Original line number	Diff line number	Diff line
		@@ -144,7 +144,7 @@ SDIRS= \
		bn ec rsa dsa dh dso engine \
		buffer bio stack lhash rand err \
		evp asn1 pem x509 x509v3 conf txt_db pkcs7 pkcs12 comp ocsp ui \
		cms pqueue ts jpake srp store cmac ct async kdf
		cms ts jpake srp store cmac ct async kdf
		# keep in mind that the above list is adjusted by ./Configure
		# according to no-xxx arguments...

crypto/pqueue/Makefile.in

deleted100644 → 0

+0 −47

Original line number	Diff line number	Diff line
		#
		# OpenSSL/crypto/pqueue/Makefile
		#

		DIR= pqueue
		TOP= ../..
		CC= cc
		INCLUDES=
		CFLAG=-g
		MAKEFILE= Makefile
		AR= ar r

		CFLAGS= $(INCLUDES) $(CFLAG)

		GENERAL=Makefile

		LIB=$(TOP)/libcrypto.a
		LIBSRC=pqueue.c
		LIBOBJ=pqueue.o

		SRC= $(LIBSRC)

		HEADER=

		ALL= $(GENERAL) $(SRC) $(HEADER)

		top:
		(cd ../..; $(MAKE) DIRS=crypto SDIRS=$(DIR) sub_all)

		all: lib

		lib: $(LIBOBJ)
		$(AR) $(LIB) $(LIBOBJ)
		$(RANLIB) $(LIB) \|\| echo Never mind.
		@touch lib

		files:
		$(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO

		depend:
		@[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
		$(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)

		clean:
		rm -f .o .obj lib tags core .pure .nfs* .old .bak fluff

		# DO NOT DELETE THIS LINE -- make depend depends on it.

crypto/pqueue/pq_test.c

deleted100644 → 0

+0 −94

Original line number	Diff line number	Diff line
		/* crypto/pqueue/pq_test.c */
		/*
		* DTLS implementation written by Nagendra Modadugu
		* (nagendra@cs.stanford.edu) for the OpenSSL project 2005.
		*/
		/* ====================================================================
		* Copyright (c) 1999-2005 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 "pqueue.h"

		int main(void)
		{
		pitem *item;
		pqueue pq;

		pq = pqueue_new();

		item = pitem_new(3, NULL);
		pqueue_insert(pq, item);

		item = pitem_new(1, NULL);
		pqueue_insert(pq, item);

		item = pitem_new(2, NULL);
		pqueue_insert(pq, item);

		item = pqueue_find(pq, 1);
		fprintf(stderr, "found %ld\n", item->priority);

		item = pqueue_find(pq, 2);
		fprintf(stderr, "found %ld\n", item->priority);

		item = pqueue_find(pq, 3);
		fprintf(stderr, "found %ld\n", item ? item->priority : 0);

		pqueue_print(pq);

		for (item = pqueue_pop(pq); item != NULL; item = pqueue_pop(pq))
		pitem_free(item);

		pqueue_free(pq);
		return 0;
		}

include/openssl/pqueue.h

deleted100644 → 0

+0 −99

Original line number	Diff line number	Diff line
		/* crypto/pqueue/pqueue.h */
		/*
		* DTLS implementation written by Nagendra Modadugu
		* (nagendra@cs.stanford.edu) for the OpenSSL project 2005.
		*/
		/* ====================================================================
		* Copyright (c) 1999-2005 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).
		*
		*/

		#ifndef HEADER_PQUEUE_H
		# define HEADER_PQUEUE_H

		# include <stdio.h>
		# include <stdlib.h>
		# include <string.h>

		#ifdef __cplusplus
		extern "C" {
		#endif
		typedef struct _pqueue *pqueue;

		typedef struct _pitem {
		unsigned char priority[8]; /* 64-bit value in big-endian encoding */
		void *data;
		struct _pitem *next;
		} pitem;

		typedef struct _pitem *piterator;

		pitem pitem_new(unsigned char prio64be, void *data);
		void pitem_free(pitem *item);

		pqueue pqueue_new(void);
		void pqueue_free(pqueue pq);

		pitem pqueue_insert(pqueue pq, pitem item);
		pitem *pqueue_peek(pqueue pq);
		pitem *pqueue_pop(pqueue pq);
		pitem pqueue_find(pqueue pq, unsigned char prio64be);
		pitem *pqueue_iterator(pqueue pq);
		pitem pqueue_next(piterator iter);

		void pqueue_print(pqueue pq);
		int pqueue_size(pqueue pq);

		#ifdef __cplusplus
		}
		#endif
		#endif /* ! HEADER_PQUEUE_H */

ssl/Makefile.in

+2 −0

Original line number	Diff line number	Diff line
		@@ -17,6 +17,7 @@ GENERAL=Makefile README ssl-lib.com install.com
		LIB=$(TOP)/libssl.a
		SHARED_LIB= libssl$(SHLIB_EXT)
		LIBSRC= \
		pqueue.c \
		statem/statem_srvr.c statem/statem_clnt.c s3_lib.c s3_enc.c record/rec_layer_s3.c \
		statem/statem_lib.c s3_cbc.c s3_msg.c \
		methods.c t1_lib.c t1_enc.c t1_ext.c \
		@@ -29,6 +30,7 @@ LIBSRC= \
		record/ssl3_buffer.c record/ssl3_record.c record/dtls1_bitmap.c \
		statem/statem.c
		LIBOBJ= \
		pqueue.o \
		statem/statem_srvr.o statem/statem_clnt.o s3_lib.o s3_enc.o record/rec_layer_s3.o \
		statem/statem_lib.o s3_cbc.o s3_msg.o \
		methods.o t1_lib.o t1_enc.o t1_ext.o \