git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
[pandora-kernel.git]
/
net
/
sunrpc
/
auth_gss
/
gss_krb5_crypto.c
diff --git
a/net/sunrpc/auth_gss/gss_krb5_crypto.c
b/net/sunrpc/auth_gss/gss_krb5_crypto.c
index
0a9948d
..
f441aa0
100644
(file)
--- a/
net/sunrpc/auth_gss/gss_krb5_crypto.c
+++ b/
net/sunrpc/auth_gss/gss_krb5_crypto.c
@@
-66,8
+66,8
@@
krb5_encrypt(
goto out;
if (crypto_blkcipher_ivsize(tfm) > 16) {
goto out;
if (crypto_blkcipher_ivsize(tfm) > 16) {
- dprintk("RPC: gss_k5encrypt: tfm iv size to large %d\n",
- crypto_blkcipher_ivsize(tfm));
+ dprintk("RPC:
gss_k5encrypt: tfm iv size to large %d\n",
+ crypto_blkcipher_ivsize(tfm));
goto out;
}
goto out;
}
@@
-79,7
+79,7
@@
krb5_encrypt(
ret = crypto_blkcipher_encrypt_iv(&desc, sg, sg, length);
out:
ret = crypto_blkcipher_encrypt_iv(&desc, sg, sg, length);
out:
- dprintk("RPC:
krb5_encrypt returns %d\n",
ret);
+ dprintk("RPC:
krb5_encrypt returns %d\n",
ret);
return ret;
}
return ret;
}
@@
-102,7
+102,7
@@
krb5_decrypt(
goto out;
if (crypto_blkcipher_ivsize(tfm) > 16) {
goto out;
if (crypto_blkcipher_ivsize(tfm) > 16) {
- dprintk("RPC: gss_k5decrypt: tfm iv size to large %d\n",
+ dprintk("RPC:
gss_k5decrypt: tfm iv size to large %d\n",
crypto_blkcipher_ivsize(tfm));
goto out;
}
crypto_blkcipher_ivsize(tfm));
goto out;
}
@@
-114,7
+114,7
@@
krb5_decrypt(
ret = crypto_blkcipher_decrypt_iv(&desc, sg, sg, length);
out:
ret = crypto_blkcipher_decrypt_iv(&desc, sg, sg, length);
out:
- dprintk("RPC: gss_k5decrypt returns %d\n",ret);
+ dprintk("RPC:
gss_k5decrypt returns %d\n",ret);
return ret;
}
return ret;
}