Commit 6c922ea7 authored by Chuck Lever's avatar Chuck Lever
Browse files

SUNRPC: Remove CONFIG_RPCSEC_GSS_KRB5_CRYPTOSYSTEM 



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

Reviewed-by: default avatarJeff Layton <jlayton@kernel.org>
Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
parent da33d635

net/sunrpc/Kconfig

+0 −7
Original line number Diff line number Diff line
@@ -34,10 +34,6 @@ config RPCSEC_GSS_KRB5 


	  If unsure, say Y.



config RPCSEC_GSS_KRB5_CRYPTOSYSTEM

	bool

	depends on RPCSEC_GSS_KRB5



config RPCSEC_GSS_KRB5_ENCTYPES_AES_SHA1

	bool "Enable Kerberos enctypes based on AES and SHA-1"

	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_AES

	default y

	select RPCSEC_GSS_KRB5_CRYPTOSYSTEM

	help

	  Choose Y to enable the use of Kerberos 5 encryption types

	  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_CMAC

	default n

	select RPCSEC_GSS_KRB5_CRYPTOSYSTEM

	help

	  Choose Y to enable the use of Kerberos 5 encryption types

	  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_AES

	default n

	select RPCSEC_GSS_KRB5_CRYPTOSYSTEM

	help

	  Choose Y to enable the use of Kerberos 5 encryption types

	  that utilize Advanced Encryption Standard (AES) ciphers and

net/sunrpc/auth_gss/gss_krb5_mech.c

+0 −7
Original line number Diff line number Diff line
@@ -29,10 +29,7 @@ 
#endif



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);

#endif



static const struct gss_krb5_enctype supported_gss_krb5_enctypes[] = {

#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);



#if defined(CONFIG_RPCSEC_GSS_KRB5_CRYPTOSYSTEM)



static struct crypto_sync_skcipher *

gss_krb5_alloc_cipher_v2(const char *cname, const struct xdr_netobj *key)

{
@@ -403,8 +398,6 @@ gss_krb5_import_ctx_v2(struct krb5_ctx *ctx, gfp_t gfp_mask) 
	goto out;

}



#endif



static int

gss_import_v2_context(const void *p, const void *end, struct krb5_ctx *ctx,

		gfp_t gfp_mask)