From 6c92130193ac22aa34ff58bcfbc1474b6fd7af3c Mon Sep 17 00:00:00 2001 From: "J. Bruce Fields" Date: Wed, 17 Mar 2010 13:02:48 -0400 Subject: [PATCH] --- yaml --- r: 192265 b: refs/heads/master c: 54ec3d462f3c2a3fe48a7bd592160bee31360087 h: refs/heads/master i: 192263: 4a8edb3129f6e947dcaa8aa25aab52c6af7f7fce v: v3 --- [refs] | 2 +- trunk/net/sunrpc/auth_gss/gss_krb5_wrap.c | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 371c40c16661..6ffe190703be 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7561042fb7870be0b4ee57efddce68bda8968abf +refs/heads/master: 54ec3d462f3c2a3fe48a7bd592160bee31360087 diff --git a/trunk/net/sunrpc/auth_gss/gss_krb5_wrap.c b/trunk/net/sunrpc/auth_gss/gss_krb5_wrap.c index 496281fabb91..5d6c3b12ea70 100644 --- a/trunk/net/sunrpc/auth_gss/gss_krb5_wrap.c +++ b/trunk/net/sunrpc/auth_gss/gss_krb5_wrap.c @@ -12,10 +12,7 @@ static inline int gss_krb5_padding(int blocksize, int length) { - /* Most of the code is block-size independent but currently we - * use only 8: */ - BUG_ON(blocksize != 8); - return 8 - (length & 7); + return blocksize - (length % blocksize); } static inline void