X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fptlrpc%2Fgss%2Fgss_sk_mech.c;h=1cb364550b86ebf44819b544a0fa786b1cd79abe;hp=75b80fe1a7cdf73fa1ac87b9e7b320b422386949;hb=7dd6c394161a62b229ba65f50044a1d8f2da2d03;hpb=49fd10ec8a2a85bbc56618d70f2f71d323d90a4c

diff --git a/lustre/ptlrpc/gss/gss_sk_mech.c b/lustre/ptlrpc/gss/gss_sk_mech.c
index 75b80fe..1cb3645 100644
--- a/lustre/ptlrpc/gss/gss_sk_mech.c
+++ b/lustre/ptlrpc/gss/gss_sk_mech.c
@@ -60,8 +60,8 @@ struct sk_ctx {
 };
 
 static struct sk_crypt_type sk_crypt_types[] = {
-	[SK_CRYPT_AES_CTR] = {
-		.sct_name = "ctr(aes)",
+	[SK_CRYPT_AES256_CTR] = {
+		.sct_name = "ctr(aes256)",
 		.sct_bytes = 32,
 	},
 };
@@ -723,6 +723,18 @@ static struct gss_api_ops gss_sk_ops = {
 
 static struct subflavor_desc gss_sk_sfs[] = {
 	{
+		.sf_subflavor   = SPTLRPC_SUBFLVR_SKN,
+		.sf_qop         = 0,
+		.sf_service     = SPTLRPC_SVC_NULL,
+		.sf_name        = "skn"
+	},
+	{
+		.sf_subflavor   = SPTLRPC_SUBFLVR_SKA,
+		.sf_qop         = 0,
+		.sf_service     = SPTLRPC_SVC_AUTH,
+		.sf_name        = "ska"
+	},
+	{
 		.sf_subflavor   = SPTLRPC_SUBFLVR_SKI,
 		.sf_qop         = 0,
 		.sf_service     = SPTLRPC_SVC_INTG,
@@ -747,7 +759,7 @@ static struct gss_api_mech gss_sk_mech = {
 		"\053\006\001\004\001\311\146\215\126\001\000\001",
 	},
 	.gm_ops         = &gss_sk_ops,
-	.gm_sf_num      = 2,
+	.gm_sf_num      = 4,
 	.gm_sfs         = gss_sk_sfs,
 };