No longer make pqueue.h a public (and installed) header file. Replace its

inclusion in <ssl/dtls1.h> by the benign
`struct _pqueue; typedef struct _pqueue *pqueue;'.

Note that said dtls1.h should probably be considered a private header as well...

ok beck@

diff --git a/lib/libssl/d1_pkt.c b/lib/libssl/d1_pkt.c
index c5bdb41..5d3aace 100644 (file)
--- a/lib/libssl/d1_pkt.c
+++ b/lib/libssl/d1_pkt.c
@@ -119,7 +119,6 @@
 #include "ssl_locl.h"
 #include <openssl/evp.h>
 #include <openssl/buffer.h>
-#include <openssl/pqueue.h>
 #include <openssl/rand.h>
 
 /* mod 128 saturating subtract of two 64-bit values in big-endian order */

diff --git a/lib/libssl/dtls1.h b/lib/libssl/dtls1.h
index beb7401..d91b6e6 100644 (file)
--- a/lib/libssl/dtls1.h
+++ b/lib/libssl/dtls1.h
@@ -61,7 +61,6 @@
 #define HEADER_DTLS1_H
 
 #include <openssl/buffer.h>
-#include <openssl/pqueue.h>
 #include <sys/time.h>
 
 #ifdef  __cplusplus
@@ -146,6 +145,9 @@ struct dtls1_timeout_st {
        unsigned int num_alerts;
 };
 
+struct _pqueue;
+typedef struct _pqueue *pqueue;
+
 typedef struct record_pqueue_st {
        unsigned short epoch;
        pqueue q;

diff --git a/lib/libssl/src/ssl/d1_pkt.c b/lib/libssl/src/ssl/d1_pkt.c
index c5bdb41..5d3aace 100644 (file)
--- a/lib/libssl/src/ssl/d1_pkt.c
+++ b/lib/libssl/src/ssl/d1_pkt.c
@@ -119,7 +119,6 @@
 #include "ssl_locl.h"
 #include <openssl/evp.h>
 #include <openssl/buffer.h>
-#include <openssl/pqueue.h>
 #include <openssl/rand.h>
 
 /* mod 128 saturating subtract of two 64-bit values in big-endian order */

diff --git a/lib/libssl/src/ssl/dtls1.h b/lib/libssl/src/ssl/dtls1.h
index beb7401..d91b6e6 100644 (file)
--- a/lib/libssl/src/ssl/dtls1.h
+++ b/lib/libssl/src/ssl/dtls1.h
@@ -61,7 +61,6 @@
 #define HEADER_DTLS1_H
 
 #include <openssl/buffer.h>
-#include <openssl/pqueue.h>
 #include <sys/time.h>
 
 #ifdef  __cplusplus
@@ -146,6 +145,9 @@ struct dtls1_timeout_st {
        unsigned int num_alerts;
 };
 
+struct _pqueue;
+typedef struct _pqueue *pqueue;
+
 typedef struct record_pqueue_st {
        unsigned short epoch;
        pqueue q;

diff --git a/lib/libssl/src/ssl/ssl_locl.h b/lib/libssl/src/ssl/ssl_locl.h
index 012a38c..a0c3017 100644 (file)
--- a/lib/libssl/src/ssl/ssl_locl.h
+++ b/lib/libssl/src/ssl/ssl_locl.h
@@ -164,6 +164,8 @@
 #include <openssl/err.h>
 #include <openssl/ssl.h>
 
+#include "pqueue.h"
+
 #define c2l(c,l)       (l = ((unsigned long)(*((c)++)))     , \
                         l|=(((unsigned long)(*((c)++)))<< 8), \
                         l|=(((unsigned long)(*((c)++)))<<16), \

diff --git a/lib/libssl/ssl/Makefile b/lib/libssl/ssl/Makefile
index 8975572..d282268 100644 (file)
--- a/lib/libssl/ssl/Makefile
+++ b/lib/libssl/ssl/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.42 2014/05/12 19:14:14 miod Exp $
+# $OpenBSD: Makefile,v 1.43 2014/05/15 19:39:46 miod Exp $
 
 LIB=   ssl
 
@@ -23,7 +23,7 @@ SRCS=\
        pqueue.c
 SRCS+= s3_cbc.c
 
-HDRS=  srtp.h ssl.h ssl2.h ssl3.h ssl23.h tls1.h dtls1.h kssl.h pqueue.h
+HDRS=  srtp.h ssl.h ssl2.h ssl3.h ssl23.h tls1.h dtls1.h kssl.h
 
 .PATH: ${LSSL_SRC}
 

diff --git a/lib/libssl/ssl_locl.h b/lib/libssl/ssl_locl.h
index 012a38c..a0c3017 100644 (file)
--- a/lib/libssl/ssl_locl.h
+++ b/lib/libssl/ssl_locl.h
@@ -164,6 +164,8 @@
 #include <openssl/err.h>
 #include <openssl/ssl.h>
 
+#include "pqueue.h"
+
 #define c2l(c,l)       (l = ((unsigned long)(*((c)++)))     , \
                         l|=(((unsigned long)(*((c)++)))<< 8), \
                         l|=(((unsigned long)(*((c)++)))<<16), \