Skip to contentSkip to conversation

keyctl_dh_compute_kdf: const-ify input parameters

PATCH Applied Ben Boeckel 2 participants 5 messages Sep 27, 2018 – Nov 2, 2018 Keys/keyrings

lore
Share & tools
lore
#0 lore raw

PATCH v2 4/7 keyctl_dh_compute_kdf: const-ify input parameters

---
 keyutils.c              | 5 +++--
 keyutils.h              | 8 ++++----
 man/keyctl_dh_compute.3 | 2 +-
 3 files changed, 8 insertions(+), 7 deletions(-)
keyutils.c +3 -2
index fc7dc4d..a087a33 100644
@@ -245,8 +245,9 @@ long keyctl_dh_compute(key_serial_t priv, key_serial_t prime,
 }
 
 long keyctl_dh_compute_kdf(key_serial_t private, key_serial_t prime,
-			   key_serial_t base, char *hashname, char *otherinfo,
-			   size_t otherinfolen, char *buffer, size_t buflen)
+			   key_serial_t base, const char *hashname,
+			   const char *otherinfo, size_t otherinfolen,
+			   char *buffer, size_t buflen)
 {
 	struct keyctl_dh_params params = { .priv = private,
 					   .prime = prime,
keyutils.h +4 -4
index 5f81c62..208c175 100644
@@ -115,8 +115,8 @@ struct keyctl_dh_params {
 };
 
 struct keyctl_kdf_params {
-	char *hashname;
-	char *otherinfo;
+	const char *hashname;
+	const char *otherinfo;
 	uint32_t otherinfolen;
 	uint32_t __spare[8];
 };
@@ -203,8 +203,8 @@ extern long keyctl_get_persistent(uid_t uid, key_serial_t id);
 extern long keyctl_dh_compute(key_serial_t priv, key_serial_t prime,
 			      key_serial_t base, char *buffer, size_t buflen);
 extern long keyctl_dh_compute_kdf(key_serial_t private, key_serial_t prime,
-				  key_serial_t base, char *hashname,
-				  char *otherinfo, size_t otherinfolen,
+				  key_serial_t base, const char *hashname,
+				  const char *otherinfo, size_t otherinfolen,
 				  char *buffer, size_t buflen);
 extern long keyctl_restrict_keyring(key_serial_t keyring, const char *type,
 				    const char *restriction);
man/keyctl_dh_compute.3 +1 -1
index 09c5d21..58ad5df 100644
@@ -25,7 +25,7 @@ keyctl_dh_compute_kdf \- Derive key from a Diffie-Hellman shared secret
 .BI "key_serial_t " prime ", key_serial_t " base ", void **" _buffer ");"
 .sp
 .BI "long keyctl_dh_compute_kdf(key_serial_t " private ", key_serial_t " prime ,
-.BI "key_serial_t " base ", char *" hashname ", char *" otherinfo ",
+.BI "key_serial_t " base ", const char *" hashname ", const char *" otherinfo ",
 .BI "size_t " otherinfolen ", char *" buffer ", size_t " buflen ");"
 .\"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 .SH DESCRIPTION
Signature · 1 line
2.19.0.221.g150f307afc
maintainer
#2 lore raw
In reply to Ben Boeckel

keyutils.h struct keyctl_dh_params { · line 122

Quoted 8 lines · Ben Boeckel

struct keyctl_kdf_params {

keyutils.h +2 -2
-	char *hashname;
-	char *otherinfo;
+	const char *hashname;
+	const char *otherinfo;
 	uint32_t otherinfolen;
 	uint32_t __spare[8];
 };

Actually, that's potentially not okay. If some code out there has:

	struct keyctl_kdf_params p = {
		.hashname = "foo"
	};

	...

	char *h = p.hashname;

that will no longer compile, so I'm not going to apply this patch for the moment.

David

#3 lore raw
In reply to Ben Boeckel
Quoted 10 lines · David Howells

Actually, that's potentially not okay. If some code out there has:

	struct keyctl_kdf_params p = {
		.hashname = "foo"
	};

	...

	char *h = p.hashname;
Quoted 2 lines

that will no longer compile, so I'm not going to apply this patch for the moment.

What code is using a non-released version of libkeyutils and expects it to work as-is when the relevant code does land? These patches are not against master, but next (sorry, should have mentioned that or made it clearer).

--Ben

maintainer
#4 lore raw
In reply to Ben Boeckel
Quoted 2 lines · Ben Boeckel

What code is using a non-released version of libkeyutils and expects it to work as-is when the relevant code does land?

Ummm...

	struct keyctl_kdf_params {
		char *hashname;
		char *otherinfo;
		uint32_t otherinfolen;
		uint32_t __spare[8];
	};

is in v1.5.11 as released in August.

David