diff options
Diffstat (limited to 'net/sunrpc/auth_gss/gss_generic_token.c')
| -rw-r--r-- | net/sunrpc/auth_gss/gss_generic_token.c | 44 | 
1 files changed, 22 insertions, 22 deletions
diff --git a/net/sunrpc/auth_gss/gss_generic_token.c b/net/sunrpc/auth_gss/gss_generic_token.c index 310b78e9945..c586e92bcf7 100644 --- a/net/sunrpc/auth_gss/gss_generic_token.c +++ b/net/sunrpc/auth_gss/gss_generic_token.c @@ -76,19 +76,19 @@ static int  der_length_size( int length)  {  	if (length < (1<<7)) -		return(1); +		return 1;  	else if (length < (1<<8)) -		return(2); +		return 2;  #if (SIZEOF_INT == 2)  	else -		return(3); +		return 3;  #else  	else if (length < (1<<16)) -		return(3); +		return 3;  	else if (length < (1<<24)) -		return(4); +		return 4;  	else -		return(5); +		return 5;  #endif  } @@ -121,14 +121,14 @@ der_read_length(unsigned char **buf, int *bufsize)  	int ret;  	if (*bufsize < 1) -		return(-1); +		return -1;  	sf = *(*buf)++;  	(*bufsize)--;  	if (sf & 0x80) {  		if ((sf &= 0x7f) > ((*bufsize)-1)) -			return(-1); +			return -1;  		if (sf > SIZEOF_INT) -			return (-1); +			return -1;  		ret = 0;  		for (; sf; sf--) {  			ret = (ret<<8) + (*(*buf)++); @@ -138,7 +138,7 @@ der_read_length(unsigned char **buf, int *bufsize)  		ret = sf;  	} -	return(ret); +	return ret;  }  /* returns the length of a token, given the mech oid and the body size */ @@ -148,7 +148,7 @@ g_token_size(struct xdr_netobj *mech, unsigned int body_size)  {  	/* set body_size to sequence contents size */  	body_size += 2 + (int) mech->len;         /* NEED overflow check */ -	return(1 + der_length_size(body_size) + body_size); +	return 1 + der_length_size(body_size) + body_size;  }  EXPORT_SYMBOL_GPL(g_token_size); @@ -186,27 +186,27 @@ g_verify_token_header(struct xdr_netobj *mech, int *body_size,  	int ret = 0;  	if ((toksize-=1) < 0) -		return(G_BAD_TOK_HEADER); +		return G_BAD_TOK_HEADER;  	if (*buf++ != 0x60) -		return(G_BAD_TOK_HEADER); +		return G_BAD_TOK_HEADER;  	if ((seqsize = der_read_length(&buf, &toksize)) < 0) -		return(G_BAD_TOK_HEADER); +		return G_BAD_TOK_HEADER;  	if (seqsize != toksize) -		return(G_BAD_TOK_HEADER); +		return G_BAD_TOK_HEADER;  	if ((toksize-=1) < 0) -		return(G_BAD_TOK_HEADER); +		return G_BAD_TOK_HEADER;  	if (*buf++ != 0x06) -		return(G_BAD_TOK_HEADER); +		return G_BAD_TOK_HEADER;  	if ((toksize-=1) < 0) -		return(G_BAD_TOK_HEADER); +		return G_BAD_TOK_HEADER;  	toid.len = *buf++;  	if ((toksize-=toid.len) < 0) -		return(G_BAD_TOK_HEADER); +		return G_BAD_TOK_HEADER;  	toid.data = buf;  	buf+=toid.len; @@ -217,17 +217,17 @@ g_verify_token_header(struct xdr_netobj *mech, int *body_size,        to return G_BAD_TOK_HEADER if the token header is in fact bad */  	if ((toksize-=2) < 0) -		return(G_BAD_TOK_HEADER); +		return G_BAD_TOK_HEADER;  	if (ret) -		return(ret); +		return ret;  	if (!ret) {  		*buf_in = buf;  		*body_size = toksize;  	} -	return(ret); +	return ret;  }  EXPORT_SYMBOL_GPL(g_verify_token_header);  |