From bb1f78b0976389edbc302ea662b80029cbf5ce5a Mon Sep 17 00:00:00 2001
From: miod <>
Date: Mon, 12 May 2014 19:14:14 +0000
Subject: Move the `pqueue' part of libcrypto, which is a glorified sorted
 linked list of 64-bit data, and only used by DTLS, to libssl where it
 belongs.

Remove pqueue_print() which is a debugging interface and serves no useful
purpose, except for the regress test, which grows its own pqueue_print()
routine.

Bump libcrypto major and libssl minor.

WARNING: do not update your tree right now, more changes are coming, which
will ride the libcrypto major bump.
---
 src/lib/libssl/ssl/Makefile      | 7 ++++---
 src/lib/libssl/ssl/shlib_version | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'src/lib/libssl/ssl')

diff --git a/src/lib/libssl/ssl/Makefile b/src/lib/libssl/ssl/Makefile
index 737121fce4..8975572be8 100644
--- a/src/lib/libssl/ssl/Makefile
+++ b/src/lib/libssl/ssl/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.41 2014/05/05 15:03:22 tedu Exp $
+# $OpenBSD: Makefile,v 1.42 2014/05/12 19:14:14 miod Exp $
 
 LIB=	ssl
 
@@ -19,10 +19,11 @@ SRCS=\
 	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 \
-	bio_ssl.c ssl_err.c t1_reneg.c
+	bio_ssl.c ssl_err.c t1_reneg.c \
+	pqueue.c
 SRCS+=	s3_cbc.c
 
-HDRS=	srtp.h ssl.h ssl2.h ssl3.h ssl23.h tls1.h dtls1.h kssl.h
+HDRS=	srtp.h ssl.h ssl2.h ssl3.h ssl23.h tls1.h dtls1.h kssl.h pqueue.h
 
 .PATH:	${LSSL_SRC}
 
diff --git a/src/lib/libssl/ssl/shlib_version b/src/lib/libssl/ssl/shlib_version
index 906022aa66..aa54cbb404 100644
--- a/src/lib/libssl/ssl/shlib_version
+++ b/src/lib/libssl/ssl/shlib_version
@@ -1,2 +1,2 @@
 major=24
-minor=0
+minor=1
-- 
cgit v1.2.3-55-g6feb