korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-11 04:18:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

SUNRPC: Remove CONFIG_RPCSEC_GSS_KRB5_CRYPTOSYSTEM

Browse Source 
This code is now always on, so the ifdef can be removed.

Reviewed-by: Jeff Layton <jlayton@kernel.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
This commit is contained in:
Chuck Lever 2023-06-29 13:51:19 -04:00
parent da33d635bb
commit 6c922ea711
2 changed files with 0 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
net/sunrpc/Kconfig
View File

@ -34,10 +34,6 @@ config RPCSEC_GSS_KRB5
If unsure, say Y. If unsure, say Y.
config RPCSEC_GSS_KRB5_CRYPTOSYSTEM
bool
depends on RPCSEC_GSS_KRB5
config RPCSEC_GSS_KRB5_ENCTYPES_AES_SHA1 config RPCSEC_GSS_KRB5_ENCTYPES_AES_SHA1
bool "Enable Kerberos enctypes based on AES and SHA-1" bool "Enable Kerberos enctypes based on AES and SHA-1"
depends on RPCSEC_GSS_KRB5 depends on RPCSEC_GSS_KRB5
@ -45,7 +41,6 @@ config RPCSEC_GSS_KRB5_ENCTYPES_AES_SHA1
depends on CRYPTO_HMAC && CRYPTO_SHA1 depends on CRYPTO_HMAC && CRYPTO_SHA1
depends on CRYPTO_AES depends on CRYPTO_AES
default y default y
select RPCSEC_GSS_KRB5_CRYPTOSYSTEM
help help
Choose Y to enable the use of Kerberos 5 encryption types Choose Y to enable the use of Kerberos 5 encryption types
that utilize Advanced Encryption Standard (AES) ciphers and that utilize Advanced Encryption Standard (AES) ciphers and
@ -58,7 +53,6 @@ config RPCSEC_GSS_KRB5_ENCTYPES_CAMELLIA
depends on CRYPTO_CBC && CRYPTO_CTS && CRYPTO_CAMELLIA depends on CRYPTO_CBC && CRYPTO_CTS && CRYPTO_CAMELLIA
depends on CRYPTO_CMAC depends on CRYPTO_CMAC
default n default n
select RPCSEC_GSS_KRB5_CRYPTOSYSTEM
help help
Choose Y to enable the use of Kerberos 5 encryption types Choose Y to enable the use of Kerberos 5 encryption types
that utilize Camellia ciphers (RFC 3713) and CMAC digests that utilize Camellia ciphers (RFC 3713) and CMAC digests
@ -72,7 +66,6 @@ config RPCSEC_GSS_KRB5_ENCTYPES_AES_SHA2
depends on CRYPTO_HMAC && CRYPTO_SHA256 && CRYPTO_SHA512 depends on CRYPTO_HMAC && CRYPTO_SHA256 && CRYPTO_SHA512
depends on CRYPTO_AES depends on CRYPTO_AES
default n default n
select RPCSEC_GSS_KRB5_CRYPTOSYSTEM
help help
Choose Y to enable the use of Kerberos 5 encryption types Choose Y to enable the use of Kerberos 5 encryption types
that utilize Advanced Encryption Standard (AES) ciphers and that utilize Advanced Encryption Standard (AES) ciphers and

7
net/sunrpc/auth_gss/gss_krb5_mech.c
View File

@ -29,10 +29,7 @@
#endif #endif
static struct gss_api_mech gss_kerberos_mech; static struct gss_api_mech gss_kerberos_mech;
#if defined(CONFIG_RPCSEC_GSS_KRB5_CRYPTOSYSTEM)
static int gss_krb5_import_ctx_v2(struct krb5_ctx *ctx, gfp_t gfp_mask); static int gss_krb5_import_ctx_v2(struct krb5_ctx *ctx, gfp_t gfp_mask);
#endif
static const struct gss_krb5_enctype supported_gss_krb5_enctypes[] = { static const struct gss_krb5_enctype supported_gss_krb5_enctypes[] = {
#if defined(CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_AES_SHA1) #if defined(CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_AES_SHA1)
@ -273,8 +270,6 @@ const struct gss_krb5_enctype *gss_krb5_lookup_enctype(u32 etype)
} }
EXPORT_SYMBOL_IF_KUNIT(gss_krb5_lookup_enctype); EXPORT_SYMBOL_IF_KUNIT(gss_krb5_lookup_enctype);
#if defined(CONFIG_RPCSEC_GSS_KRB5_CRYPTOSYSTEM)
static struct crypto_sync_skcipher * static struct crypto_sync_skcipher *
gss_krb5_alloc_cipher_v2(const char *cname, const struct xdr_netobj *key) gss_krb5_alloc_cipher_v2(const char *cname, const struct xdr_netobj *key)
{ {
@ -403,8 +398,6 @@ out_free:
goto out; goto out;
} }
#endif
static int static int
gss_import_v2_context(const void *p, const void *end, struct krb5_ctx *ctx, gss_import_v2_context(const void *p, const void *end, struct krb5_ctx *ctx,
gfp_t gfp_mask) gfp_t gfp_mask)