SUNRPC: Hoist KDF into struct gss_krb5_enctype

Browse source

Each Kerberos enctype can have a different KDF. Refactor the key
derivation path to support different KDFs for the enctypes
introduced in subsequent patches.

In particular, expose the key derivation function in struct
gss_krb5_enctype instead of the enctype's preferred random-to-key
function. The latter is usually the identity function and is only
ever called during key derivation, so have each KDF call it
directly.

A couple of extra clean-ups:
- Deduplicate the set_cdata() helper
- Have ->derive_key return negative errnos, in accordance with usual
  kernel coding conventions

This patch is a little bigger than I'd like, but these are all
mechanical changes and they are all to the same areas of code. No
behavior change is intended.

Tested-by: Scott Mayhew <smayhew@redhat.com>
Reviewed-by: Simo Sorce <simo@redhat.com>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>

...

This commit is contained in:

Chuck Lever 2023-01-15 12:22:11 -05:00

parent ae6ad5d0b7

commit 2691a27d9b

4 changed files with 156 additions and 122 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

25

include/linux/sunrpc/gss_krb5.h

View file

46

net/sunrpc/auth_gss/gss_krb5_internal.h

View file

133

net/sunrpc/auth_gss/gss_krb5_keys.c

View file

76

net/sunrpc/auth_gss/gss_krb5_mech.c

View file