[openssl-commits] [openssl] master update
Rich Salz
rsalz at openssl.org
Sun Jan 24 23:25:13 UTC 2016
The branch master has been updated
via cf2cede4a75f5e269f791bf1dcc029bba8c1f689 (commit)
from 68ed0b2480023424f280e98cda7199d913f3d7cc (commit)
- Log -----------------------------------------------------------------
commit cf2cede4a75f5e269f791bf1dcc029bba8c1f689
Author: Rich Salz <rsalz at akamai.com>
Date: Fri Jan 22 14:54:01 2016 -0500
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 at openssl.org>
-----------------------------------------------------------------------
Summary of changes:
Makefile.in | 2 +-
crypto/pqueue/Makefile.in | 47 -------------------
crypto/pqueue/pq_test.c | 94 --------------------------------------
include/openssl/pqueue.h | 99 -----------------------------------------
ssl/Makefile.in | 2 +
ssl/d1_lib.c | 4 +-
{crypto/pqueue => ssl}/pqueue.c | 27 ++++++-----
ssl/record/rec_layer_d1.c | 7 ++-
ssl/record/record.h | 4 +-
ssl/ssl_locl.h | 28 +++++++++++-
ssl/statem/statem_dtls.c | 2 +-
util/libeay.num | 24 +++++-----
util/mkdef.pl | 1 -
13 files changed, 61 insertions(+), 280 deletions(-)
delete mode 100644 crypto/pqueue/Makefile.in
delete mode 100644 crypto/pqueue/pq_test.c
delete mode 100644 include/openssl/pqueue.h
rename {crypto/pqueue => ssl}/pqueue.c (91%)
diff --git a/Makefile.in b/Makefile.in
index e93d4a4..9278783 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -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...
diff --git a/crypto/pqueue/Makefile.in b/crypto/pqueue/Makefile.in
deleted file mode 100644
index 9fb8b56..0000000
--- a/crypto/pqueue/Makefile.in
+++ /dev/null
@@ -1,47 +0,0 @@
-#
-# 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.
diff --git a/crypto/pqueue/pq_test.c b/crypto/pqueue/pq_test.c
deleted file mode 100644
index 479ab22..0000000
--- a/crypto/pqueue/pq_test.c
+++ /dev/null
@@ -1,94 +0,0 @@
-/* crypto/pqueue/pq_test.c */
-/*
- * DTLS implementation written by Nagendra Modadugu
- * (nagendra at 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 at 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 at cryptsoft.com). This product includes software written by Tim
- * Hudson (tjh at 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;
-}
diff --git a/include/openssl/pqueue.h b/include/openssl/pqueue.h
deleted file mode 100644
index d40d9c7..0000000
--- a/include/openssl/pqueue.h
+++ /dev/null
@@ -1,99 +0,0 @@
-/* crypto/pqueue/pqueue.h */
-/*
- * DTLS implementation written by Nagendra Modadugu
- * (nagendra at 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 at 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 at cryptsoft.com). This product includes software written by Tim
- * Hudson (tjh at 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 */
diff --git a/ssl/Makefile.in b/ssl/Makefile.in
index fd0ab76..b3860d3 100644
--- a/ssl/Makefile.in
+++ b/ssl/Makefile.in
@@ -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 \
diff --git a/ssl/d1_lib.c b/ssl/d1_lib.c
index aaa9803..88822c0 100644
--- a/ssl/d1_lib.c
+++ b/ssl/d1_lib.c
@@ -201,8 +201,8 @@ void dtls1_free(SSL *s)
void dtls1_clear(SSL *s)
{
- pqueue buffered_messages;
- pqueue sent_messages;
+ pqueue *buffered_messages;
+ pqueue *sent_messages;
unsigned int mtu;
unsigned int link_mtu;
diff --git a/crypto/pqueue/pqueue.c b/ssl/pqueue.c
similarity index 91%
rename from crypto/pqueue/pqueue.c
rename to ssl/pqueue.c
index b6e19c7..21ee83e 100644
--- a/crypto/pqueue/pqueue.c
+++ b/ssl/pqueue.c
@@ -57,14 +57,13 @@
*
*/
-#include "internal/cryptlib.h"
+#include "ssl_locl.h"
#include <openssl/bn.h>
-#include <openssl/pqueue.h>
-typedef struct _pqueue {
+struct pqueue_st {
pitem *items;
int count;
-} pqueue_s;
+};
pitem *pitem_new(unsigned char *prio64be, void *data)
{
@@ -85,19 +84,19 @@ void pitem_free(pitem *item)
OPENSSL_free(item);
}
-pqueue_s *pqueue_new()
+pqueue *pqueue_new()
{
- pqueue_s *pq = OPENSSL_zalloc(sizeof(*pq));
+ pqueue *pq = OPENSSL_zalloc(sizeof(*pq));
return pq;
}
-void pqueue_free(pqueue_s *pq)
+void pqueue_free(pqueue *pq)
{
OPENSSL_free(pq);
}
-pitem *pqueue_insert(pqueue_s *pq, pitem *item)
+pitem *pqueue_insert(pqueue *pq, pitem *item)
{
pitem *curr, *next;
@@ -133,12 +132,12 @@ pitem *pqueue_insert(pqueue_s *pq, pitem *item)
return item;
}
-pitem *pqueue_peek(pqueue_s *pq)
+pitem *pqueue_peek(pqueue *pq)
{
return pq->items;
}
-pitem *pqueue_pop(pqueue_s *pq)
+pitem *pqueue_pop(pqueue *pq)
{
pitem *item = pq->items;
@@ -148,7 +147,7 @@ pitem *pqueue_pop(pqueue_s *pq)
return item;
}
-pitem *pqueue_find(pqueue_s *pq, unsigned char *prio64be)
+pitem *pqueue_find(pqueue *pq, unsigned char *prio64be)
{
pitem *next;
pitem *found = NULL;
@@ -173,7 +172,7 @@ pitem *pqueue_find(pqueue_s *pq, unsigned char *prio64be)
return found;
}
-void pqueue_print(pqueue_s *pq)
+void pqueue_print(pqueue *pq)
{
pitem *item = pq->items;
@@ -187,7 +186,7 @@ void pqueue_print(pqueue_s *pq)
}
}
-pitem *pqueue_iterator(pqueue_s *pq)
+pitem *pqueue_iterator(pqueue *pq)
{
return pqueue_peek(pq);
}
@@ -206,7 +205,7 @@ pitem *pqueue_next(pitem **item)
return ret;
}
-int pqueue_size(pqueue_s *pq)
+int pqueue_size(pqueue *pq)
{
pitem *item = pq->items;
int count = 0;
diff --git a/ssl/record/rec_layer_d1.c b/ssl/record/rec_layer_d1.c
index ebe486e..eabbddb 100644
--- a/ssl/record/rec_layer_d1.c
+++ b/ssl/record/rec_layer_d1.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>
#include "record_locl.h"
@@ -165,9 +164,9 @@ void DTLS_RECORD_LAYER_clear(RECORD_LAYER *rl)
DTLS_RECORD_LAYER *d;
pitem *item = NULL;
DTLS1_RECORD_DATA *rdata;
- pqueue unprocessed_rcds;
- pqueue processed_rcds;
- pqueue buffered_app_data;
+ pqueue *unprocessed_rcds;
+ pqueue *processed_rcds;
+ pqueue *buffered_app_data;
d = rl->d;
diff --git a/ssl/record/record.h b/ssl/record/record.h
index af10166..36ae3a1 100644
--- a/ssl/record/record.h
+++ b/ssl/record/record.h
@@ -109,8 +109,6 @@
*
*/
-#include <openssl/pqueue.h>
-
/*****************************************************************************
* *
* These structures should be considered PRIVATE to the record layer. No *
@@ -186,7 +184,7 @@ typedef struct dtls1_bitmap_st {
typedef struct record_pqueue_st {
unsigned short epoch;
- pqueue q;
+ struct pqueue_st *q;
} record_pqueue;
typedef struct dtls1_record_data_st {
diff --git a/ssl/ssl_locl.h b/ssl/ssl_locl.h
index d9ff1c2..3745f0f 100644
--- a/ssl/ssl_locl.h
+++ b/ssl/ssl_locl.h
@@ -1390,6 +1390,30 @@ typedef struct hm_fragment_st {
unsigned char *reassembly;
} hm_fragment;
+typedef struct pqueue_st pqueue;
+typedef struct pitem_st pitem;
+
+struct pitem_st {
+ unsigned char priority[8]; /* 64-bit value in big-endian encoding */
+ void *data;
+ pitem *next;
+};
+
+typedef struct pitem_st *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);
+
typedef struct dtls1_state_st {
unsigned char cookie[DTLS1_COOKIE_LENGTH];
unsigned int cookie_len;
@@ -1401,9 +1425,9 @@ typedef struct dtls1_state_st {
unsigned short handshake_read_seq;
/* Buffered handshake messages */
- pqueue buffered_messages;
+ pqueue *buffered_messages;
/* Buffered (sent) handshake records */
- pqueue sent_messages;
+ pqueue *sent_messages;
unsigned int link_mtu; /* max on-the-wire DTLS packet size */
unsigned int mtu; /* max DTLS packet size */
diff --git a/ssl/statem/statem_dtls.c b/ssl/statem/statem_dtls.c
index 627f20a..3aa3488 100644
--- a/ssl/statem/statem_dtls.c
+++ b/ssl/statem/statem_dtls.c
@@ -1066,7 +1066,7 @@ int dtls1_get_queue_priority(unsigned short seq, int is_ccs)
int dtls1_retransmit_buffered_messages(SSL *s)
{
- pqueue sent = s->d1->sent_messages;
+ pqueue *sent = s->d1->sent_messages;
piterator iter;
pitem *item;
hm_fragment *frag;
diff --git a/util/libeay.num b/util/libeay.num
index 0e568e0..3630572 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 88c45c7..097d252 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";
More information about the openssl-commits
mailing list