git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
net
/
sunrpc
/
auth_gss
/
gss_spkm3_token.c
diff --git
a/net/sunrpc/auth_gss/gss_spkm3_token.c
b/net/sunrpc/auth_gss/gss_spkm3_token.c
index
af0d7ce
..
35188b6
100644
(file)
--- a/
net/sunrpc/auth_gss/gss_spkm3_token.c
+++ b/
net/sunrpc/auth_gss/gss_spkm3_token.c
@@
-90,10
+90,9
@@
asn1_bitstring_len(struct xdr_netobj *in, int *enclen, int *zerobits)
int
decode_asn1_bitstring(struct xdr_netobj *out, char *in, int enclen, int explen)
{
int
decode_asn1_bitstring(struct xdr_netobj *out, char *in, int enclen, int explen)
{
- if (!(out->data = k
m
alloc(explen,GFP_KERNEL)))
+ if (!(out->data = k
z
alloc(explen,GFP_KERNEL)))
return 0;
out->len = explen;
return 0;
out->len = explen;
- memset(out->data, 0, explen);
memcpy(out->data, in, enclen);
return 1;
}
memcpy(out->data, in, enclen);
return 1;
}
@@
-173,10
+172,10
@@
spkm3_mic_header(unsigned char **hdrbuf, unsigned int *hdrlen, unsigned char *ct
*(u8 *)hptr++ = zbit;
memcpy(hptr, ctxdata, elen);
hptr += elen;
*(u8 *)hptr++ = zbit;
memcpy(hptr, ctxdata, elen);
hptr += elen;
- *hdrlen = hptr - top;
+ *hdrlen = hptr - top;
}
}
-
-/*
+
+/*
* spkm3_mic_innercontext_token()
*
* *tokp points to the beginning of the SPKM_MIC token described
* spkm3_mic_innercontext_token()
*
* *tokp points to the beginning of the SPKM_MIC token described