From: Matt Caswell Date: Wed, 14 Dec 2016 14:39:38 +0000 (+0000) Subject: Remove a redundant function X-Git-Tag: OpenSSL_1_1_1-pre1~2718 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=2ec6cb33856e56a3e7d15c019f17e08a8bb33093;p=oweals%2Fopenssl.git Remove a redundant function The extensions refactor made this function redundant so we can remove it. Reviewed-by: Rich Salz (Merged from https://github.com/openssl/openssl/pull/2157) --- diff --git a/ssl/ssl_locl.h b/ssl/ssl_locl.h index 9f974efbe0..78fc001477 100644 --- a/ssl/ssl_locl.h +++ b/ssl/ssl_locl.h @@ -2140,9 +2140,6 @@ __owur int tls1_get_curvelist(SSL *s, int sess, const unsigned char **pcurves, void ssl_set_default_md(SSL *s); __owur int tls1_set_server_sigalgs(SSL *s); -__owur RAW_EXTENSION *tls_get_extension_by_type(RAW_EXTENSION *exts, - size_t numexts, - unsigned int type); __owur int tls_get_ticket_from_client(SSL *s, CLIENTHELLO_MSG *hello, SSL_SESSION **ret); __owur int tls_use_ticket(SSL *s); diff --git a/ssl/t1_lib.c b/ssl/t1_lib.c index 1ca2b61bec..bc9a109929 100644 --- a/ssl/t1_lib.c +++ b/ssl/t1_lib.c @@ -1046,29 +1046,6 @@ int tls1_set_server_sigalgs(SSL *s) return 0; } -/* - * Given a list of extensions that we collected earlier, find one of a given - * type and return it. - * - * |exts| is the set of extensions previously collected. - * |numexts| is the number of extensions that we have. - * |type| the type of the extension that we are looking for. - * - * Returns a pointer to the found RAW_EXTENSION data, or NULL if not found. - */ -RAW_EXTENSION *tls_get_extension_by_type(RAW_EXTENSION *exts, size_t numexts, - unsigned int type) -{ - size_t loop; - - for (loop = 0; loop < numexts; loop++) { - if (exts[loop].type == type) - return &exts[loop]; - } - - return NULL; -} - /*- * Gets the ticket information supplied by the client if any. *