diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-07-21 11:19:50 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-07-21 11:19:50 -0400 |
commit | eb6a12c2428d21a9f3e0f1a50e927d5fd80fc3d0 (patch) | |
tree | 5ac6f43899648abeab1d43aad3107f664e7f13d5 /net/sunrpc/auth_gss/gss_krb5_crypto.c | |
parent | c4762aba0b1f72659aae9ce37b772ca8bd8f06f4 (diff) | |
parent | 14b395e35d1afdd8019d11b92e28041fad591b71 (diff) |
Merge branch 'linus' into cpus4096-for-linus
Conflicts:
net/sunrpc/svc.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'net/sunrpc/auth_gss/gss_krb5_crypto.c')
-rw-r--r-- | net/sunrpc/auth_gss/gss_krb5_crypto.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/net/sunrpc/auth_gss/gss_krb5_crypto.c b/net/sunrpc/auth_gss/gss_krb5_crypto.c index 1d52308ca324..c93fca204558 100644 --- a/net/sunrpc/auth_gss/gss_krb5_crypto.c +++ b/net/sunrpc/auth_gss/gss_krb5_crypto.c | |||
@@ -83,8 +83,6 @@ out: | |||
83 | return ret; | 83 | return ret; |
84 | } | 84 | } |
85 | 85 | ||
86 | EXPORT_SYMBOL(krb5_encrypt); | ||
87 | |||
88 | u32 | 86 | u32 |
89 | krb5_decrypt( | 87 | krb5_decrypt( |
90 | struct crypto_blkcipher *tfm, | 88 | struct crypto_blkcipher *tfm, |
@@ -118,8 +116,6 @@ out: | |||
118 | return ret; | 116 | return ret; |
119 | } | 117 | } |
120 | 118 | ||
121 | EXPORT_SYMBOL(krb5_decrypt); | ||
122 | |||
123 | static int | 119 | static int |
124 | checksummer(struct scatterlist *sg, void *data) | 120 | checksummer(struct scatterlist *sg, void *data) |
125 | { | 121 | { |
@@ -161,8 +157,6 @@ out: | |||
161 | return err ? GSS_S_FAILURE : 0; | 157 | return err ? GSS_S_FAILURE : 0; |
162 | } | 158 | } |
163 | 159 | ||
164 | EXPORT_SYMBOL(make_checksum); | ||
165 | |||
166 | struct encryptor_desc { | 160 | struct encryptor_desc { |
167 | u8 iv[8]; /* XXX hard-coded blocksize */ | 161 | u8 iv[8]; /* XXX hard-coded blocksize */ |
168 | struct blkcipher_desc desc; | 162 | struct blkcipher_desc desc; |
@@ -262,8 +256,6 @@ gss_encrypt_xdr_buf(struct crypto_blkcipher *tfm, struct xdr_buf *buf, | |||
262 | return ret; | 256 | return ret; |
263 | } | 257 | } |
264 | 258 | ||
265 | EXPORT_SYMBOL(gss_encrypt_xdr_buf); | ||
266 | |||
267 | struct decryptor_desc { | 259 | struct decryptor_desc { |
268 | u8 iv[8]; /* XXX hard-coded blocksize */ | 260 | u8 iv[8]; /* XXX hard-coded blocksize */ |
269 | struct blkcipher_desc desc; | 261 | struct blkcipher_desc desc; |
@@ -334,5 +326,3 @@ gss_decrypt_xdr_buf(struct crypto_blkcipher *tfm, struct xdr_buf *buf, | |||
334 | 326 | ||
335 | return xdr_process_buf(buf, offset, buf->len - offset, decryptor, &desc); | 327 | return xdr_process_buf(buf, offset, buf->len - offset, decryptor, &desc); |
336 | } | 328 | } |
337 | |||
338 | EXPORT_SYMBOL(gss_decrypt_xdr_buf); | ||