From: John Baldwin <jhb@FreeBSD.org>
Date: Thu, 3 Sep 2020 17:56:10 +0000 (-0700)
Subject: Remove unused dummy functions from ktls.h.
X-Git-Tag: openssl-3.0.0-alpha7~376
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=74eee1bdaa03cfcb3b1df01beff2b6d81a113f58;p=thirdparty%2Fopenssl.git

Remove unused dummy functions from ktls.h.

The KTLS functions are always used under #ifndef OPENSSL_NO_KTLS, so
the dummy functions were never used.

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Ben Kaduk <kaduk@mit.edu>
(Merged from https://github.com/openssl/openssl/pull/12782)
---

diff --git a/include/internal/ktls.h b/include/internal/ktls.h
index 2af1589f98a..5b5e3cb4e4b 100644
--- a/include/internal/ktls.h
+++ b/include/internal/ktls.h
@@ -400,33 +400,5 @@ static ossl_inline int ktls_read_record(int fd, void *data, size_t length)
 #   endif /* OPENSSL_NO_KTLS_RX */
 
 #  endif /* OPENSSL_SYS_LINUX */
-# else /* OPENSSL_NO_KTLS */
-/* Dummy functions here */
-static ossl_inline int ktls_enable(int fd)
-{
-    return 0;
-}
-
-static ossl_inline int ktls_start(int fd, void *crypto_info,
-                                  size_t len, int is_tx)
-{
-    return 0;
-}
-
-static ossl_inline int ktls_send_ctrl_message(int fd, unsigned char record_type,
-                                              const void *data, size_t length)
-{
-    return -1;
-}
-
-static ossl_inline int ktls_read_record(int fd, void *data, size_t length)
-{
-    return -1;
-}
-
-static ossl_inline ossl_ssize_t ktls_sendfile(int s, int fd, off_t off, size_t size, int flags)
-{
-    return -1;
-}
 # endif /* OPENSSL_NO_KTLS */
 #endif /* HEADER_INTERNAL_KTLS */