Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,5 @@ AUTOMAKE_OPTIONS = foreign

EXTRA_DIST = autogen.sh CONTRIBUTING.md LICENSE.txt \
README.md SECURITY.md
SUBDIRS = src systemd
SUBDIRS = man src systemd
MAINTAINERCLEANFILES = Makefile.in cscope.* ktls-utils*.tar.gz
10 changes: 9 additions & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ AC_USE_SYSTEM_EXTENSIONS
AC_LANG(C)
AC_PROG_CC
AC_PROG_INSTALL
AC_PROG_MKDIR_P

unitdir=/usr/lib/systemd/system
AC_ARG_WITH(systemd,
Expand Down Expand Up @@ -93,5 +94,12 @@ fi

AC_SUBST([AM_CPPFLAGS])

AC_CONFIG_FILES([Makefile src/Makefile src/tlshd/Makefile systemd/Makefile])
AC_CONFIG_FILES([Makefile \
man/Makefile \
man/man5/Makefile \
man/man8/Makefile \
src/Makefile \
src/tlshd/Makefile \
systemd/Makefile])

AC_OUTPUT
21 changes: 21 additions & 0 deletions man/Makefile.am
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
#
# Copyright (c) 2025 Oracle and/or its affiliates.
#
# ktls-utils is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License as
# published by the Free Software Foundation; version 2.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
# 02110-1301, USA.
#

SUBDIRS = man5 man8

MAINTAINERCLEANFILES = Makefile.in
21 changes: 21 additions & 0 deletions man/man5/Makefile.am
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
#
# Copyright (c) 2025 Oracle and/or its affiliates.
#
# ktls-utils is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License as
# published by the Free Software Foundation; version 2.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
# 02110-1301, USA.
#

dist_man5_MANS = tlshd.conf.5

MAINTAINERCLEANFILES = Makefile.in
2 changes: 1 addition & 1 deletion src/tlshd/tlshd.conf.man → man/man5/tlshd.conf.5
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
.SH NAME
tlshd.conf \- tlshd configuration file
.SH SYNOPSIS
.B /etc/tlshd.conf
.I /etc/tlshd.conf
.SH DESCRIPTION
The
.B tlshd
Expand Down
21 changes: 21 additions & 0 deletions man/man8/Makefile.am
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
#
# Copyright (c) 2025 Oracle and/or its affiliates.
#
# ktls-utils is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License as
# published by the Free Software Foundation; version 2.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
# 02110-1301, USA.
#

dist_man8_MANS = tlshd.8

MAINTAINERCLEANFILES = Makefile.in
9 changes: 4 additions & 5 deletions src/tlshd/tlshd.man → man/man8/tlshd.8
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,13 @@ The
.B tlshd
program implements a user agent that services TLS handshake requests
on behalf of kernel TLS consumers.
Using the
.BR accept (2)
system call, it materializes kernel socket endpoints in user space
in order to perform TLS handshakes using a TLS library.
It materializes kernel socket endpoints in user space
in order to perform TLS handshakes using a standard TLS library.
After each handshake completes,
.B tlshd
plants TLS session metadata into the kernel socket to enable
the use of kTLS to secure subsequent communication on that socket.
the use of kTLS to secure subsequent communication on that socket,
and passes the socket back to the kernel.
.SH OPTIONS
.TP
.B \-c " or " \-\-config
Expand Down
4 changes: 0 additions & 4 deletions src/tlshd/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,6 @@

dist_sysconf_DATA = tlshd.conf

man5_MANS = tlshd.conf.man
man8_MANS = tlshd.man
EXTRA_DIST = $(man5_MANS) $(man8_MANS)

sbin_PROGRAMS = tlshd
tlshd_CFLAGS = -Werror -Wall -Wextra $(LIBGNUTLS_CFLAGS) \
$(LIBKEYUTILS_CFLAGS) $(GLIB_CFLAGS) $(LIBNL3_CFLAGS) \
Expand Down
Loading