From cae932e85bddcbaad90a6a775998c92be9230bc2 Mon Sep 17 00:00:00 2001 From: David Benjamin Date: Thu, 30 Jul 2015 22:40:55 -0400 Subject: [PATCH] Remove SSL_get0_ec_point_formats. It's never called anywhere and doesn't return anything interesting. Change-Id: I68e7e9cd7b74a72f61092ac5d2b5d2390e55a228 Reviewed-on: https://boringssl-review.googlesource.com/5540 Reviewed-by: Adam Langley --- include/openssl/ssl.h | 4 ---- ssl/s3_lib.c | 9 --------- 2 files changed, 13 deletions(-) diff --git a/include/openssl/ssl.h b/include/openssl/ssl.h index 02445bf3..7a3da455 100644 --- a/include/openssl/ssl.h +++ b/include/openssl/ssl.h @@ -1996,7 +1996,6 @@ DECLARE_PEM_rw(SSL_SESSION, SSL_SESSION) #define SSL_CTRL_SET_CLIENT_CERT_TYPES 104 #define SSL_CTRL_SET_VERIFY_CERT_STORE 106 #define SSL_CTRL_SET_CHAIN_CERT_STORE 107 -#define SSL_CTRL_GET_EC_POINT_FORMATS 111 /* DTLSv1_get_timeout queries the next DTLS handshake timeout. If there is a * timeout in progress, it sets |*out| to the time remaining and returns one. @@ -2139,9 +2138,6 @@ OPENSSL_EXPORT size_t SSL_get_tls_channel_id(SSL *ssl, uint8_t *out, #define SSL_set1_client_certificate_types(s, clist, clistlen) \ SSL_ctrl(s, SSL_CTRL_SET_CLIENT_CERT_TYPES, clistlen, (char *)clist) -#define SSL_get0_ec_point_formats(s, plst) \ - SSL_ctrl(s, SSL_CTRL_GET_EC_POINT_FORMATS, 0, (char *)plst) - OPENSSL_EXPORT int SSL_CTX_set_cipher_list(SSL_CTX *, const char *str); OPENSSL_EXPORT int SSL_CTX_set_cipher_list_tls11(SSL_CTX *, const char *str); OPENSSL_EXPORT long SSL_CTX_set_timeout(SSL_CTX *ctx, long t); diff --git a/ssl/s3_lib.c b/ssl/s3_lib.c index f9041e07..86d18427 100644 --- a/ssl/s3_lib.c +++ b/ssl/s3_lib.c @@ -425,15 +425,6 @@ long ssl3_ctrl(SSL *s, int cmd, long larg, void *parg) { case SSL_CTRL_SET_CHAIN_CERT_STORE: return ssl_cert_set_cert_store(s->cert, parg, 1, larg); - case SSL_CTRL_GET_EC_POINT_FORMATS: { - const uint8_t **pformat = parg; - if (!s->s3->tmp.peer_ecpointformatlist) { - return 0; - } - *pformat = s->s3->tmp.peer_ecpointformatlist; - return (int)s->s3->tmp.peer_ecpointformatlist_length; - } - default: break; }