Move pqueue into ssl

This is an internal facility, never documented, not for
public consumption.  Move it into ssl (where it's only used
for DTLS).

I also made the typedef's for pqueue and pitem follow our style: they
name structures, not pointers.

Reviewed-by: Richard Levitte <levitte@openssl.org>

2 files changed, 12 insertions, 13 deletions

diff --git a/util/libeay.num b/util/libeay.num
index 0e568e0beb..36305725f8 100755
--- a/util/libeay.num
+++ b/util/libeay.num
@@ -2908,7 +2908,7 @@ BN_GF2m_mod_exp_arr                     3361	1_1_0	EXIST::FUNCTION:EC2M
 STORE_ATTR_INFO_modify_number           3362	1_1_0	NOEXIST::FUNCTION:
 X509_keyid_get0                         3363	1_1_0	EXIST::FUNCTION:
 ENGINE_load_gmp                         3364	1_1_0	NOEXIST::FUNCTION:
-pitem_new                               3365	1_1_0	EXIST::FUNCTION:
+pitem_new                               3365	1_1_0	NOEXIST::FUNCTION:
 BN_GF2m_mod_mul_arr                     3366	1_1_0	EXIST::FUNCTION:EC2M
 STORE_list_public_key_endp              3367	1_1_0	NOEXIST::FUNCTION:
 o2i_ECPublicKey                         3368	1_1_0	EXIST::FUNCTION:EC
@@ -2939,7 +2939,7 @@ STORE_delete_public_key                 3390	1_1_0	NOEXIST::FUNCTION:
 STORE_get_public_key                    3391	1_1_0	NOEXIST::FUNCTION:
 STORE_modify_arbitrary                  3392	1_1_0	NOEXIST::FUNCTION:
 ENGINE_get_static_state                 3393	1_1_0	EXIST::FUNCTION:ENGINE
-pqueue_iterator                         3394	1_1_0	EXIST::FUNCTION:
+pqueue_iterator                         3394	1_1_0	NOEXIST::FUNCTION:
 ECDSA_SIG_new                           3395	1_1_0	EXIST::FUNCTION:EC
 OPENSSL_DIR_end                         3396	1_1_0	EXIST::FUNCTION:
 BN_GF2m_mod_sqr                         3397	1_1_0	EXIST::FUNCTION:EC2M
@@ -2977,7 +2977,7 @@ STORE_meth_get_generate_fn              3426	1_1_0	NOEXIST::FUNCTION:
 STORE_method_get_generate_function      3426	1_1_0	NOEXIST::FUNCTION:
 STORE_meth_set_list_end_fn              3427	1_1_0	NOEXIST::FUNCTION:
 STORE_method_set_list_end_function      3427	1_1_0	NOEXIST::FUNCTION:
-pqueue_print                            3428	1_1_0	EXIST::FUNCTION:
+pqueue_print                            3428	1_1_0	NOEXIST::FUNCTION:
 EC_GROUP_have_precompute_mult           3429	1_1_0	EXIST::FUNCTION:EC
 EC_KEY_print_fp                         3430	1_1_0	EXIST::FUNCTION:EC,STDIO
 BN_GF2m_mod_arr                         3431	1_1_0	EXIST::FUNCTION:EC2M
@@ -3004,13 +3004,13 @@ EVP_PKEY_set1_EC_KEY                    3450	1_1_0	EXIST::FUNCTION:EC
 BN_GF2m_mod_sqrt_arr                    3451	1_1_0	EXIST::FUNCTION:EC2M
 i2d_ECPrivateKey_bio                    3452	1_1_0	EXIST::FUNCTION:EC
 ECPKParameters_print_fp                 3453	1_1_0	EXIST::FUNCTION:EC,STDIO
-pqueue_find                             3454	1_1_0	EXIST::FUNCTION:
+pqueue_find                             3454	1_1_0	NOEXIST::FUNCTION:
 ECDSA_SIG_free                          3455	1_1_0	EXIST::FUNCTION:EC
 PEM_write_bio_ECPKParameters            3456	1_1_0	EXIST::FUNCTION:EC
 STORE_method_set_ctrl_function          3457	1_1_0	NOEXIST::FUNCTION:
 STORE_list_public_key_end               3458	1_1_0	NOEXIST::FUNCTION:
 EC_KEY_set_private_key                  3459	1_1_0	EXIST::FUNCTION:EC
-pqueue_peek                             3460	1_1_0	EXIST::FUNCTION:
+pqueue_peek                             3460	1_1_0	NOEXIST::FUNCTION:
 STORE_get_arbitrary                     3461	1_1_0	NOEXIST::FUNCTION:
 STORE_store_crl                         3462	1_1_0	NOEXIST::FUNCTION:
 X509_policy_node_get0_policy            3463	1_1_0	EXIST::FUNCTION:
@@ -3212,7 +3212,7 @@ PEM_write_ECPKParameters                3643	1_1_0	EXIST::FUNCTION:EC
 ECDH_compute_key                        3644	1_1_0	EXIST::FUNCTION:EC
 STORE_ATTR_INFO_get0_sha1str            3645	1_1_0	NOEXIST::FUNCTION:
 ENGINE_register_all_ECDH                3646	1_1_0	NOEXIST::FUNCTION:
-pqueue_pop                              3647	1_1_0	EXIST::FUNCTION:
+pqueue_pop                              3647	1_1_0	NOEXIST::FUNCTION:
 STORE_ATTR_INFO_get0_cstr               3648	1_1_0	NOEXIST::FUNCTION:
 POLICY_CONSTRAINTS_it                   3649	1_1_0	EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
 POLICY_CONSTRAINTS_it                   3649	1_1_0	EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
@@ -3275,7 +3275,7 @@ asn1_const_Finish                       3700	1_1_0	NOEXIST::FUNCTION:
 i2d_EC_PUBKEY_fp                        3701	1_1_0	EXIST::FUNCTION:EC,STDIO
 BN_nist_mod_256                         3702	1_1_0	EXIST::FUNCTION:
 X509_VERIFY_PARAM_add0_table            3703	1_1_0	EXIST::FUNCTION:
-pqueue_free                             3704	1_1_0	EXIST::FUNCTION:
+pqueue_free                             3704	1_1_0	NOEXIST::FUNCTION:
 BN_BLINDING_create_param                3705	1_1_0	EXIST::FUNCTION:
 ECDSA_size                              3706	1_1_0	EXIST::FUNCTION:EC
 d2i_EC_PUBKEY_bio                       3707	1_1_0	EXIST::FUNCTION:EC
@@ -3327,12 +3327,12 @@ EC_KEY_check_key                        3750	1_1_0	EXIST::FUNCTION:EC
 d2i_EC_PUBKEY_fp                        3751	1_1_0	EXIST::FUNCTION:EC,STDIO
 PKCS7_set0_type_other                   3752	1_1_0	EXIST::FUNCTION:
 PEM_read_bio_X509_CERT_PAIR             3753	1_1_0	NOEXIST::FUNCTION:
-pqueue_next                             3754	1_1_0	EXIST::FUNCTION:
+pqueue_next                             3754	1_1_0	NOEXIST::FUNCTION:
 STORE_meth_get_list_end_fn              3755	1_1_0	NOEXIST::FUNCTION:
 STORE_method_get_list_end_function      3755	1_1_0	NOEXIST::FUNCTION:
 EVP_PKEY_add1_attr_by_OBJ               3756	1_1_0	EXIST::FUNCTION:
 X509_VERIFY_PARAM_set_time              3757	1_1_0	EXIST::FUNCTION:
-pqueue_new                              3758	1_1_0	EXIST::FUNCTION:
+pqueue_new                              3758	1_1_0	NOEXIST::FUNCTION:
 ENGINE_set_default_ECDH                 3759	1_1_0	NOEXIST::FUNCTION:
 STORE_new_method                        3760	1_1_0	NOEXIST::FUNCTION:
 PKCS12_add_key                          3761	1_1_0	EXIST::FUNCTION:
@@ -3340,8 +3340,8 @@ DSO_merge                               3762	1_1_0	EXIST::FUNCTION:
 EC_POINT_hex2point                      3763	1_1_0	EXIST::FUNCTION:EC
 BIO_dump_cb                             3764	1_1_0	EXIST::FUNCTION:
 SHA256_Update                           3765	1_1_0	EXIST::FUNCTION:
-pqueue_insert                           3766	1_1_0	EXIST::FUNCTION:
-pitem_free                              3767	1_1_0	EXIST::FUNCTION:
+pqueue_insert                           3766	1_1_0	NOEXIST::FUNCTION:
+pitem_free                              3767	1_1_0	NOEXIST::FUNCTION:
 BN_GF2m_mod_inv_arr                     3768	1_1_0	EXIST::FUNCTION:EC2M
 ENGINE_unregister_ECDSA                 3769	1_1_0	NOEXIST::FUNCTION:
 BN_BLINDING_set_thread_id               3770	1_1_0	EXIST::FUNCTION:DEPRECATEDIN_1_0_0
@@ -3703,7 +3703,7 @@ JPAKE_STEP2_release                     4110	1_1_0	EXIST::FUNCTION:JPAKE
 JPAKE_STEP3A_init                       4111	1_1_0	EXIST::FUNCTION:JPAKE
 ERR_load_JPAKE_strings                  4112	1_1_0	EXIST::FUNCTION:JPAKE
 JPAKE_STEP2_init                        4113	1_1_0	EXIST::FUNCTION:JPAKE
-pqueue_size                             4114	1_1_0	EXIST::FUNCTION:
+pqueue_size                             4114	1_1_0	NOEXIST::FUNCTION:
 i2d_TS_ACCURACY                         4115	1_1_0	EXIST::FUNCTION:
 i2d_TS_MSG_IMPRINT_fp                   4116	1_1_0	EXIST::FUNCTION:STDIO
 i2d_TS_MSG_IMPRINT                      4117	1_1_0	EXIST::FUNCTION:
diff --git a/util/mkdef.pl b/util/mkdef.pl
index 88c45c7d9b..097d25283b 100755
--- a/util/mkdef.pl
+++ b/util/mkdef.pl
@@ -292,7 +292,6 @@ $crypto.=" include/openssl/comp.h" ; # unless $no_comp;
 $crypto.=" include/openssl/ocsp.h";
 $crypto.=" include/openssl/ui.h";
 #$crypto.=" include/openssl/store.h";
-$crypto.=" include/openssl/pqueue.h";
 $crypto.=" include/openssl/cms.h";
 $crypto.=" include/openssl/jpake.h";
 $crypto.=" include/openssl/srp.h";