From c1db0dc07d6e0ac875ebf58e470033cae25909f9 Mon Sep 17 00:00:00 2001
From: miod <miod@openbsd.org>
Date: Tue, 6 May 2014 20:27:17 +0000
Subject: [PATCH] Add a fixed (read: non-SIGSEGV'ing) pq_test.

---
 regress/lib/libcrypto/Makefile         |  3 +-
 regress/lib/libcrypto/pqueue/Makefile  | 10 +++
 regress/lib/libcrypto/pqueue/pq_test.c | 99 ++++++++++++++++++++++++++
 3 files changed, 111 insertions(+), 1 deletion(-)
 create mode 100644 regress/lib/libcrypto/pqueue/Makefile
 create mode 100644 regress/lib/libcrypto/pqueue/pq_test.c

diff --git a/regress/lib/libcrypto/Makefile b/regress/lib/libcrypto/Makefile
index 345077c20c9..22737367a3d 100644
--- a/regress/lib/libcrypto/Makefile
+++ b/regress/lib/libcrypto/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.7 2014/05/03 15:07:46 jsing Exp $
+#	$OpenBSD: Makefile,v 1.8 2014/05/06 20:27:17 miod Exp $
 
 SUBDIR= \
 	aeswrap \
@@ -23,6 +23,7 @@ SUBDIR= \
 	md4 \
 	md5 \
 	mdc2 \
+	pqueue \
 	rand \
 	rc2 \
 	rc4 \
diff --git a/regress/lib/libcrypto/pqueue/Makefile b/regress/lib/libcrypto/pqueue/Makefile
new file mode 100644
index 00000000000..02a1816b0a4
--- /dev/null
+++ b/regress/lib/libcrypto/pqueue/Makefile
@@ -0,0 +1,10 @@
+#	$OpenBSD: Makefile,v 1.1 2014/05/06 20:27:19 miod Exp $
+
+PROG=	pq_test
+CRYPTO=	${.CURDIR}/../../../../lib/libssl/src/crypto
+CFLAGS+= -I${CRYPTO}/pqueue
+
+LDADD=	-lcrypto
+DPADD=	${LIBCRYPTO}
+
+.include <bsd.regress.mk>
diff --git a/regress/lib/libcrypto/pqueue/pq_test.c b/regress/lib/libcrypto/pqueue/pq_test.c
new file mode 100644
index 00000000000..22e3beae421
--- /dev/null
+++ b/regress/lib/libcrypto/pqueue/pq_test.c
@@ -0,0 +1,99 @@
+/* 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"
+
+unsigned char prio1[8] = "supercal";
+unsigned char prio2[8] = "ifragili";
+unsigned char prio3[8] = "sticexpi";
+
+int
+main(void)
+{
+	pitem *item;
+	pqueue pq;
+
+	pq = pqueue_new();
+
+	item = pitem_new(prio3, NULL);
+	pqueue_insert(pq, item);
+
+	item = pitem_new(prio1, NULL);
+	pqueue_insert(pq, item);
+
+	item = pitem_new(prio2, NULL);
+	pqueue_insert(pq, item);
+
+	item = pqueue_find(pq, prio1);
+	fprintf(stderr, "found %ld\n", item->priority);
+
+	item = pqueue_find(pq, prio2);
+	fprintf(stderr, "found %ld\n", item->priority);
+
+	item = pqueue_find(pq, prio3);
+	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;
+}
-- 
2.20.1