diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2011-05-05 18:29:50 +0200 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-05-05 18:29:50 +0200 |
commit | 74369dc68068f53cba7323bff3d250e1c2704725 (patch) | |
tree | 88afe4d86cef5401c76e272a60a2d7c095040b94 /target | |
parent | 7586e91b240e94d5fc3c1b9f781db99b815932ce (diff) | |
parent | 82fc7fc2b245824d07828b224b4c989277b5cf4f (diff) |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'target')
-rw-r--r-- | target/linux/config/Config.in.crypto | 14 | ||||
-rw-r--r-- | target/linux/config/Config.in.fsnet | 33 |
2 files changed, 34 insertions, 13 deletions
diff --git a/target/linux/config/Config.in.crypto b/target/linux/config/Config.in.crypto index ee8d65c20..ff6fb6b00 100644 --- a/target/linux/config/Config.in.crypto +++ b/target/linux/config/Config.in.crypto @@ -163,6 +163,20 @@ config ADK_KPACKAGE_KMOD_CRYPTO_SEQIV This IV generator generates an IV based on a sequence number by xoring it with a salt. This algorithm is mainly useful for CTR +config ADK_KPACKAGE_KMOD_CRYPTO_CTS + prompt "kmod-crypto-cts...................... CTS support" + tristate + select ADK_KPACKAGE_KMOD_CRYPTO_BLKCIPHER2 + select ADK_KPACKAGE_KMOD_CRYPTO_MANAGER2 + default n + help + CTS: Cipher Text Stealing + This is the Cipher Text Stealing mode as described by + Section 8 of rfc2040 and referenced by rfc3962. + (rfc3962 includes errata information in its Appendix A) + This mode is required for Kerberos gss mechanism support + for AES encryption. + config ADK_KPACKAGE_KMOD_CRYPTO_CBC prompt "kmod-crypto-cbc...................... CBC support" tristate diff --git a/target/linux/config/Config.in.fsnet b/target/linux/config/Config.in.fsnet index fa90abfe2..756ffaa18 100644 --- a/target/linux/config/Config.in.fsnet +++ b/target/linux/config/Config.in.fsnet @@ -50,6 +50,8 @@ config ADK_KPACKAGE_KMOD_NFS_FS tristate default n select ADK_KERNEL_NFS_V3 + select ADK_KERNEL_NFS_V4 + select ADK_KERNEL_DNOTIFY select ADK_KPACKAGE_KMOD_SUNRPC select ADK_KPACKAGE_KMOD_LOCKD select ADK_KERNEL_NETWORK_FILESYSTEMS @@ -92,12 +94,18 @@ config ADK_KERNEL_NFSD_V3 boolean default n +config ADK_KERNEL_NFSD_V4 + boolean + default n + config ADK_KPACKAGE_KMOD_NFSD prompt "kmod-fs-nfsd...................... NFS server support (includes V3 support)" tristate default n select ADK_KPACKAGE_KMOD_EXPORTFS if !ADK_KERNEL_EXPORTFS select ADK_KERNEL_NFSD_V3 + select ADK_KERNEL_NFSD_V4 + select ADK_KERNEL_DNOTIFY select ADK_KPACKAGE_KMOD_SUNRPC select ADK_KPACKAGE_KMOD_LOCKD select ADK_KERNEL_NETWORK_FILESYSTEMS @@ -122,19 +130,6 @@ config ADK_KPACKAGE_KMOD_NFSD Please read the NFS-HOWTO, available from <http://www.tldp.org/docs.html#howto>. -config ADK_KERNEL_NFSD_V4 - prompt "Enable NFSv4 and RPC Kerberos" - boolean - depends on !ADK_TARGET_ROOTFS_NFSROOT - depends on ADK_KPACKAGE_KMOD_NFSD || ADK_KPACKAGE_KMOD_NFS_FS - select ADK_KPACKAGE_KMOD_SUNRPC_GSS - select ADK_KPACKAGE_KMOD_RPCSEC_GSS_KRB5 - select ADK_KERNEL_NFS_V4 - select ADK_KERNEL_DNOTIFY - default n - help - NFSv4 with Kerberos authentication. - config ADK_KPACKAGE_KMOD_LOCKD tristate default n @@ -151,5 +146,17 @@ config ADK_KPACKAGE_KMOD_SUNRPC_GSS config ADK_KPACKAGE_KMOD_RPCSEC_GSS_KRB5 tristate + select ADK_KERNEL_NETWORK_FILESYSTEMS select ADK_KPACKAGE_KMOD_SUNRPC_GSS + select ADK_KPACKAGE_KMOD_SUNRPC + select ADK_KPACKAGE_KMOD_CRYPTO + select ADK_KPACKAGE_KMOD_CRYPTO_MD5 + select ADK_KPACKAGE_KMOD_CRYPTO_DES + select ADK_KPACKAGE_KMOD_CRYPTO_CBC + select ADK_KPACKAGE_KMOD_CRYPTO_CTS + select ADK_KPACKAGE_KMOD_CRYPTO_ECB + select ADK_KPACKAGE_KMOD_CRYPTO_HMAC + select ADK_KPACKAGE_KMOD_CRYPTO_SHA1 + select ADK_KPACKAGE_KMOD_CRYPTO_AES + select ADK_KPACKAGE_KMOD_CRYPTO_ARC4 default n |