SUNRPC: Remove CONFIG_RPCSEC_GSS_KRB5_CRYPTOSYSTEM

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>

diff --git a/net/sunrpc/Kconfig b/net/sunrpc/Kconfig
index 68c95cfd8afa0c09b0f8d2d4066a5404a9ce4750..2d8b67dac7b5b58a8a86c3022dd573746fb22547 100644 (file)
--- a/net/sunrpc/Kconfig
+++ b/net/sunrpc/Kconfig
@@ -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

diff --git a/net/sunrpc/auth_gss/gss_krb5_mech.c b/net/sunrpc/auth_gss/gss_krb5_mech.c
index 09fff5011d11848e85ae06ceff544f739be919cc..38a0c93e4b60e9a202ad1334a6524facc0891057 100644 (file)
--- a/net/sunrpc/auth_gss/gss_krb5_mech.c
+++ b/net/sunrpc/auth_gss/gss_krb5_mech.c
@@ -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 @@ out_free:
        goto out;
 }
 
-#endif
-
 static int
 gss_import_v2_context(const void *p, const void *end, struct krb5_ctx *ctx,
                gfp_t gfp_mask)