From: Hannes Reinecke <hare@suse.de>
To: Chuck Lever <chuck.lever@oracle.com>
Cc: kernel-tls-handshake@lists.linux.dev, Hannes Reinecke <hare@suse.de>
Subject: [PATCH 2/4] tls-handshake: add 'keyring' netlink attribute
Date: Fri, 17 Feb 2023 12:31:43 +0100 [thread overview]
Message-ID: <20230217113145.18916-3-hare@suse.de> (raw)
In-Reply-To: <20230217113145.18916-1-hare@suse.de>
Add a 'keyring' netlink attribute to the 'request' netlink
message to allow the kernel to communicate the keyring to use
to userspace.
Signed-off-by: Hannes Reinecke <hare@suse.de>
---
include/net/tls.h | 1 +
include/uapi/linux/handshake.h | 1 +
net/tls/tls_handshake.c | 8 ++++++++
3 files changed, 10 insertions(+)
diff --git a/include/net/tls.h b/include/net/tls.h
index 51bf5a083cce..f4baf3b4b179 100644
--- a/include/net/tls.h
+++ b/include/net/tls.h
@@ -524,6 +524,7 @@ enum {
TLS_NO_CERT = 0,
TLS_NO_PRIVKEY = 0,
TLS_NO_TIMEOUT = 0,
+ TLS_NO_KEYRING = 0,
};
typedef void (*tls_done_func_t)(void *data, int status,
diff --git a/include/uapi/linux/handshake.h b/include/uapi/linux/handshake.h
index b007e346cfc8..83705b1d1e9a 100644
--- a/include/uapi/linux/handshake.h
+++ b/include/uapi/linux/handshake.h
@@ -65,6 +65,7 @@ enum handshake_tls_accept_attrs {
HANDSHAKE_GENL_ATTR_TLS_X509_PRIVKEY,
HANDSHAKE_GENL_ATTR_TLS_PSK,
HANDSHAKE_GENL_ATTR_TLS_TIMEOUT,
+ HANDSHAKE_GENL_ATTR_TLS_KEYRING,
__HANDSHAKE_GENL_ATTR_TLS_ACCEPT_MAX
};
diff --git a/net/tls/tls_handshake.c b/net/tls/tls_handshake.c
index 66adac8d660a..8171b3c8f3a5 100644
--- a/net/tls/tls_handshake.c
+++ b/net/tls/tls_handshake.c
@@ -43,6 +43,7 @@ struct tls_handshake_req {
int th_type;
int th_auth_type;
unsigned int th_timeout;
+ key_serial_t th_keyring;
key_serial_t th_peerid;
key_serial_t th_certificate;
key_serial_t th_privkey;
@@ -74,6 +75,7 @@ tls_handshake_req_init(struct handshake_req *req, tls_done_func_t done,
treq->th_certificate = TLS_NO_CERT;
treq->th_privkey = TLS_NO_PRIVKEY;
treq->th_timeout = TLS_NO_TIMEOUT;
+ treq->th_keyring = TLS_NO_KEYRING;
return treq;
}
@@ -170,6 +172,12 @@ static int tls_handshake_put_accept_resp(struct sk_buff *msg,
if (ret < 0)
goto out;
}
+ if (treq->th_keyring != TLS_NO_KEYRING) {
+ ret = nla_put_u32(msg, HANDSHAKE_GENL_ATTR_TLS_KEYRING,
+ treq->th_keyring);
+ if (ret < 0)
+ goto out;
+ }
ret = nla_put_string(msg, HANDSHAKE_GENL_ATTR_TLS_PRIORITIES,
treq->th_priorities);
--
2.35.3
next prev parent reply other threads:[~2023-02-17 11:31 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-17 11:31 [PATCH 0/4] tls-handshake: server-side support Hannes Reinecke
2023-02-17 11:31 ` [PATCH 1/4] tls-handshake: add 'timeout' netlink attribute Hannes Reinecke
2023-02-17 11:58 ` Chuck Lever III
2023-02-17 12:17 ` Hannes Reinecke
2023-02-17 12:26 ` Chuck Lever III
2023-02-17 12:36 ` Hannes Reinecke
2023-02-17 12:38 ` Chuck Lever III
2023-02-17 11:31 ` Hannes Reinecke [this message]
2023-02-17 12:00 ` [PATCH 2/4] tls-handshake: add 'keyring' " Chuck Lever III
2023-02-17 12:24 ` Hannes Reinecke
2023-02-17 12:32 ` Chuck Lever III
2023-02-17 12:48 ` Hannes Reinecke
2023-02-17 12:56 ` Chuck Lever III
2023-02-17 11:31 ` [PATCH 3/4] net/tls_handshake: split tls_server_hello() Hannes Reinecke
2023-02-17 11:31 ` [PATCH 4/4] tls_handshake: add 'keyring' argument to server hello Hannes Reinecke
2023-02-17 11:56 ` [PATCH 0/4] tls-handshake: server-side support Chuck Lever III
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230217113145.18916-3-hare@suse.de \
--to=hare@suse.de \
--cc=chuck.lever@oracle.com \
--cc=kernel-tls-handshake@lists.linux.dev \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).