diff options
| author | Xiaoyin Liu <xiaoyinl@users.noreply.github.com> | 2017-07-29 19:20:47 -0400 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2017-07-30 17:42:00 -0400 |
| commit | 3c051806ce842ebcc56b4818fa2fdf0fe3ee5c34 (patch) | |
| tree | 12dae245b084d47ce7069e444812dae17008285a /ssl | |
| parent | 00f3a013c30736a37c90c47d5a45191eaa3051c7 (diff) | |
| download | openssl-3c051806ce842ebcc56b4818fa2fdf0fe3ee5c34.tar.gz | |
Remove redundant declarations in ssl_locl.h
Remove the function prototypes for ssl_cert_get0_next_certificate, ssl_set_default_md, tls1_shared_list,
dtls1_send_newsession_ticket, tls1_ctrl, and tls1_callback_ctrl, all of which are not defined.
It also changed the signature of the function pqueue_next to `pitem *pqueue_next(piterator *item)` in
pqueue.c, making it match the prototype in ssl_locl.h. (`piterator *` is equivalent to `pitem **`.)
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4049)
Diffstat (limited to 'ssl')
| -rw-r--r-- | ssl/pqueue.c | 2 | ||||
| -rw-r--r-- | ssl/ssl_locl.h | 8 |
2 files changed, 1 insertions, 9 deletions
diff --git a/ssl/pqueue.c b/ssl/pqueue.c index 7e0ced9909..b431850f22 100644 --- a/ssl/pqueue.c +++ b/ssl/pqueue.c @@ -127,7 +127,7 @@ pitem *pqueue_iterator(pqueue *pq) return pqueue_peek(pq); } -pitem *pqueue_next(pitem **item) +pitem *pqueue_next(piterator *item) { pitem *ret; diff --git a/ssl/ssl_locl.h b/ssl/ssl_locl.h index 12cc3ca057..ce678a66db 100644 --- a/ssl/ssl_locl.h +++ b/ssl/ssl_locl.h @@ -2115,7 +2115,6 @@ __owur int ssl_cert_add0_chain_cert(SSL *s, SSL_CTX *ctx, X509 *x); __owur int ssl_cert_add1_chain_cert(SSL *s, SSL_CTX *ctx, X509 *x); __owur int ssl_cert_select_current(CERT *c, X509 *x); __owur int ssl_cert_set_current(CERT *c, long arg); -__owur X509 *ssl_cert_get0_next_certificate(CERT *c, int first); void ssl_cert_set_cert_cb(CERT *c, int (*cb) (SSL *ssl, void *arg), void *arg); __owur int ssl_verify_cert_chain(SSL *s, STACK_OF(X509) *sk); @@ -2245,7 +2244,6 @@ __owur int dtls1_is_timer_expired(SSL *s); void dtls1_double_timeout(SSL *s); __owur int dtls_raw_hello_verify_request(WPACKET *pkt, unsigned char *cookie, size_t cookie_len); -__owur int dtls1_send_newsession_ticket(SSL *s); __owur size_t dtls1_min_mtu(SSL *s); void dtls1_hm_fragment_free(hm_fragment *frag); __owur int dtls1_query_mtu(SSL *s); @@ -2253,8 +2251,6 @@ __owur int dtls1_query_mtu(SSL *s); __owur int tls1_new(SSL *s); void tls1_free(SSL *s); int tls1_clear(SSL *s); -long tls1_ctrl(SSL *s, int cmd, long larg, void *parg); -long tls1_callback_ctrl(SSL *s, int cmd, void (*fp) (void)); __owur int dtls1_new(SSL *s); void dtls1_free(SSL *s); @@ -2346,14 +2342,10 @@ __owur int tls1_check_ec_tmp_key(SSL *s, unsigned long id); __owur EVP_PKEY *ssl_generate_pkey_curve(int id); # endif /* OPENSSL_NO_EC */ -__owur int tls1_shared_list(SSL *s, - const unsigned char *l1, size_t l1len, - const unsigned char *l2, size_t l2len, int nmatch); __owur int tls_curve_allowed(SSL *s, const unsigned char *curve, int op); __owur int tls1_get_curvelist(SSL *s, int sess, const unsigned char **pcurves, size_t *num_curves); -void ssl_set_default_md(SSL *s); __owur int tls1_set_server_sigalgs(SSL *s); /* Return codes for tls_get_ticket_from_client() and tls_decrypt_ticket() */ |