Changeset 05e2d9e in mod_gnutls

Timestamp:

Jan 14, 2020, 4:04:17 AM (11 months ago)

Author:

Fiona Klute <fiona.klute@…>

Branches:

master, proxy-ticket

Children:

b22def6

Parents:

cc748329

Message:

Move function declarations for gnutls_io.c into a separate header

Files:

• include/mod_gnutls.h.in (modified) (2 diffs)
• src/Makefile.am (modified) (1 diff)
• src/gnutls_hooks.c (modified) (1 diff)
• src/gnutls_io.c (modified) (1 diff)
• src/gnutls_io.h (added)
• src/mod_gnutls.c (modified) (1 diff)

include/mod_gnutls.h.in

@@ -261 +261 @@
 
 
-/** Functions in gnutls_io.c **/
-
 /* apr_signal_block() for blocking SIGPIPE */
 apr_status_t apr_signal_block(int signum);
@@ -294 +292 @@
 apr_status_t mgs_cleanup_pre_config(void *data);
 
-/**
- * mgs_filter_input will filter the input data
- * by decrypting it using GnuTLS and passes it cleartext.
- *
- * @param f     the filter info record
- * @param bb    the bucket brigade, where to store the result to
- * @param mode  what shall we read?
- * @param block a block index we shall read from?
- * @return result status
- */
-apr_status_t mgs_filter_input(ap_filter_t * f,
-                                     apr_bucket_brigade * bb,
-                                     ap_input_mode_t mode,
-                                     apr_read_type_e block,
-                                     apr_off_t readbytes);
-
-/**
- * mgs_filter_output will filter the encrypt
- * the incoming bucket using GnuTLS and passes it onto the next filter.
- *
- * @param f     the filter info record
- * @param bb    the bucket brigade, where to store the result to
- * @return result status
- */
-apr_status_t mgs_filter_output(ap_filter_t * f,
-                                      apr_bucket_brigade * bb);
-
-
-/**
- * mgs_transport_read is called from GnuTLS to provide encrypted
- * data from the client.
- *
- * @param ptr     pointer to the filter context
- * @param buffer  place to put data
- * @param len     maximum size
- * @return size   length of the data stored in buffer
- */
-ssize_t mgs_transport_read(gnutls_transport_ptr_t ptr,
-                                  void *buffer, size_t len);
-
-/**
- * mgs_transport_write is called from GnuTLS to
- * write data to the client.
- *
- * @param ptr     pointer to the filter context
- * @param buffer  buffer to write to the client
- * @param len     size of the buffer
- * @return size   length of the data written
- */
-ssize_t mgs_transport_write(gnutls_transport_ptr_t ptr,
-                                   const void *buffer, size_t len);
-
-
-int mgs_rehandshake(mgs_handle_t * ctxt);
-
 
 

src/Makefile.am

@@ -11 +11 @@
 mod_gnutls_la_CFLAGS = -Wall ${MODULE_CFLAGS}
 mod_gnutls_la_LDFLAGS = -module -avoid-version ${MODULE_LIBS}
-noinst_HEADERS = gnutls_cache.h gnutls_config.h gnutls_ocsp.h \
+noinst_HEADERS = gnutls_cache.h gnutls_config.h gnutls_io.h gnutls_ocsp.h \
         gnutls_proxy.h gnutls_sni.h gnutls_util.h gnutls_watchdog.h
 

src/gnutls_hooks.c

@@ -22 +22 @@
 #include "gnutls_cache.h"
 #include "gnutls_config.h"
+#include "gnutls_io.h"
 #include "gnutls_ocsp.h"
 #include "gnutls_proxy.h"

src/gnutls_io.c

@@ -19 +19 @@
 
 #include "mod_gnutls.h"
+#include "gnutls_io.h"
 #include "gnutls_proxy.h"
 

src/mod_gnutls.c

@@ -20 +20 @@
 #include "mod_gnutls.h"
 #include "gnutls_config.h"
+#include "gnutls_io.h"
 #include "gnutls_ocsp.h"
 #include "gnutls_util.h"