Commit afc52b1e authored by Dr. David Alan Gilbert's avatar Dr. David Alan Gilbert Committed by Chuck Lever
Browse files

sunrpc: Remove gss_generic_token deadcode 



Commit ec596aaf ("SUNRPC: Remove code behind
CONFIG_RPCSEC_GSS_KRB5_SIMPLIFIED") was the last user of the routines
in gss_generic_token.c.

Remove the routines and associated header.

Signed-off-by: default avatarDr. David Alan Gilbert <linux@treblig.org>
Reviewed-by: default avatarJeff Layton <jlayton@kernel.org>
Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
parent ee0d90d4

include/linux/sunrpc/gss_asn1.h

deleted100644 → 0
+0 −81
Original line number Diff line number Diff line 
/*

 *  linux/include/linux/sunrpc/gss_asn1.h

 *

 *  minimal asn1 for generic encoding/decoding of gss tokens

 *

 *  Adapted from MIT Kerberos 5-1.2.1 lib/include/krb5.h,

 *  lib/gssapi/krb5/gssapiP_krb5.h, and others

 *

 *  Copyright (c) 2000 The Regents of the University of Michigan.

 *  All rights reserved.

 *

 *  Andy Adamson   <andros@umich.edu>

 */



/*

 * Copyright 1995 by the Massachusetts Institute of Technology.

 * All Rights Reserved.

 *

 * Export of this software from the United States of America may

 *   require a specific license from the United States Government.

 *   It is the responsibility of any person or organization contemplating

 *   export to obtain such a license before exporting.

 *

 * WITHIN THAT CONSTRAINT, permission to use, copy, modify, and

 * distribute this software and its documentation for any purpose and

 * without fee is hereby granted, provided that the above copyright

 * notice appear in all copies and that both that copyright notice and

 * this permission notice appear in supporting documentation, and that

 * the name of M.I.T. not be used in advertising or publicity pertaining

 * to distribution of the software without specific, written prior

 * permission.  Furthermore if you modify this software you must label

 * your software as modified software and not distribute it in such a

 * fashion that it might be confused with the original M.I.T. software.

 * M.I.T. makes no representations about the suitability of

 * this software for any purpose.  It is provided "as is" without express

 * or implied warranty.

 *

 */





#include <linux/sunrpc/gss_api.h>



#define SIZEOF_INT 4



/* from gssapi_err_generic.h */

#define G_BAD_SERVICE_NAME                       (-2045022976L)

#define G_BAD_STRING_UID                         (-2045022975L)

#define G_NOUSER                                 (-2045022974L)

#define G_VALIDATE_FAILED                        (-2045022973L)

#define G_BUFFER_ALLOC                           (-2045022972L)

#define G_BAD_MSG_CTX                            (-2045022971L)

#define G_WRONG_SIZE                             (-2045022970L)

#define G_BAD_USAGE                              (-2045022969L)

#define G_UNKNOWN_QOP                            (-2045022968L)

#define G_NO_HOSTNAME                            (-2045022967L)

#define G_BAD_HOSTNAME                           (-2045022966L)

#define G_WRONG_MECH                             (-2045022965L)

#define G_BAD_TOK_HEADER                         (-2045022964L)

#define G_BAD_DIRECTION                          (-2045022963L)

#define G_TOK_TRUNC                              (-2045022962L)

#define G_REFLECT                                (-2045022961L)

#define G_WRONG_TOKID                            (-2045022960L)



#define g_OID_equal(o1,o2) \

   (((o1)->len == (o2)->len) && \

    (memcmp((o1)->data,(o2)->data,(int) (o1)->len) == 0))



u32 g_verify_token_header(

     struct xdr_netobj *mech,

     int *body_size,

     unsigned char **buf_in,

     int toksize);



int g_token_size(

     struct xdr_netobj *mech,

     unsigned int body_size);



void g_make_token_header(

     struct xdr_netobj *mech,

     int body_size,

     unsigned char **buf);

include/linux/sunrpc/gss_krb5.h

+0 −1
Original line number Diff line number Diff line
@@ -40,7 +40,6 @@ 
#include <crypto/skcipher.h>

#include <linux/sunrpc/auth_gss.h>

#include <linux/sunrpc/gss_err.h>

#include <linux/sunrpc/gss_asn1.h>



/* Length of constant used in key derivation */

#define GSS_KRB5_K5CLENGTH (5)

net/sunrpc/auth_gss/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 


obj-$(CONFIG_SUNRPC_GSS) += auth_rpcgss.o



auth_rpcgss-y := auth_gss.o gss_generic_token.o \

auth_rpcgss-y := auth_gss.o \

	gss_mech_switch.o svcauth_gss.o \

	gss_rpc_upcall.o gss_rpc_xdr.o trace.o

net/sunrpc/auth_gss/gss_generic_token.c

deleted100644 → 0
+0 −231
Original line number Diff line number Diff line 
/*

 *  linux/net/sunrpc/gss_generic_token.c

 *

 *  Adapted from MIT Kerberos 5-1.2.1 lib/gssapi/generic/util_token.c

 *

 *  Copyright (c) 2000 The Regents of the University of Michigan.

 *  All rights reserved.

 *

 *  Andy Adamson   <andros@umich.edu>

 */



/*

 * Copyright 1993 by OpenVision Technologies, Inc.

 *

 * Permission to use, copy, modify, distribute, and sell this software

 * and its documentation for any purpose is hereby granted without fee,

 * provided that the above copyright notice appears in all copies and

 * that both that copyright notice and this permission notice appear in

 * supporting documentation, and that the name of OpenVision not be used

 * in advertising or publicity pertaining to distribution of the software

 * without specific, written prior permission. OpenVision makes no

 * representations about the suitability of this software for any

 * purpose.  It is provided "as is" without express or implied warranty.

 *

 * OPENVISION DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,

 * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO

 * EVENT SHALL OPENVISION BE LIABLE FOR ANY SPECIAL, INDIRECT OR

 * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF

 * USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR

 * OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR

 * PERFORMANCE OF THIS SOFTWARE.

 */



#include <linux/types.h>

#include <linux/module.h>

#include <linux/string.h>

#include <linux/sunrpc/sched.h>

#include <linux/sunrpc/gss_asn1.h>





#if IS_ENABLED(CONFIG_SUNRPC_DEBUG)

# define RPCDBG_FACILITY        RPCDBG_AUTH

#endif





/* TWRITE_STR from gssapiP_generic.h */

#define TWRITE_STR(ptr, str, len) \

	memcpy((ptr), (char *) (str), (len)); \

	(ptr) += (len);



/* XXXX this code currently makes the assumption that a mech oid will

   never be longer than 127 bytes.  This assumption is not inherent in

   the interfaces, so the code can be fixed if the OSI namespace

   balloons unexpectedly. */



/* Each token looks like this:



0x60				tag for APPLICATION 0, SEQUENCE

					(constructed, definite-length)

	<length>		possible multiple bytes, need to parse/generate

	0x06			tag for OBJECT IDENTIFIER

		<moid_length>	compile-time constant string (assume 1 byte)

		<moid_bytes>	compile-time constant string

	<inner_bytes>		the ANY containing the application token

					bytes 0,1 are the token type

					bytes 2,n are the token data



For the purposes of this abstraction, the token "header" consists of

the sequence tag and length octets, the mech OID DER encoding, and the

first two inner bytes, which indicate the token type.  The token

"body" consists of everything else.



*/



static int

der_length_size( int length)

{

	if (length < (1<<7))

		return 1;

	else if (length < (1<<8))

		return 2;

#if (SIZEOF_INT == 2)

	else

		return 3;

#else

	else if (length < (1<<16))

		return 3;

	else if (length < (1<<24))

		return 4;

	else

		return 5;

#endif

}



static void

der_write_length(unsigned char **buf, int length)

{

	if (length < (1<<7)) {

		*(*buf)++ = (unsigned char) length;

	} else {

		*(*buf)++ = (unsigned char) (der_length_size(length)+127);

#if (SIZEOF_INT > 2)

		if (length >= (1<<24))

			*(*buf)++ = (unsigned char) (length>>24);

		if (length >= (1<<16))

			*(*buf)++ = (unsigned char) ((length>>16)&0xff);

#endif

		if (length >= (1<<8))

			*(*buf)++ = (unsigned char) ((length>>8)&0xff);

		*(*buf)++ = (unsigned char) (length&0xff);

	}

}



/* returns decoded length, or < 0 on failure.  Advances buf and

   decrements bufsize */



static int

der_read_length(unsigned char **buf, int *bufsize)

{

	unsigned char sf;

	int ret;



	if (*bufsize < 1)

		return -1;

	sf = *(*buf)++;

	(*bufsize)--;

	if (sf & 0x80) {

		if ((sf &= 0x7f) > ((*bufsize)-1))

			return -1;

		if (sf > SIZEOF_INT)

			return -1;

		ret = 0;

		for (; sf; sf--) {

			ret = (ret<<8) + (*(*buf)++);

			(*bufsize)--;

		}

	} else {

		ret = sf;

	}



	return ret;

}



/* returns the length of a token, given the mech oid and the body size */



int

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;

}



EXPORT_SYMBOL_GPL(g_token_size);



/* fills in a buffer with the token header.  The buffer is assumed to

   be the right size.  buf is advanced past the token header */



void

g_make_token_header(struct xdr_netobj *mech, int body_size, unsigned char **buf)

{

	*(*buf)++ = 0x60;

	der_write_length(buf, 2 + mech->len + body_size);

	*(*buf)++ = 0x06;

	*(*buf)++ = (unsigned char) mech->len;

	TWRITE_STR(*buf, mech->data, ((int) mech->len));

}



EXPORT_SYMBOL_GPL(g_make_token_header);



/*

 * Given a buffer containing a token, reads and verifies the token,

 * leaving buf advanced past the token header, and setting body_size

 * to the number of remaining bytes.  Returns 0 on success,

 * G_BAD_TOK_HEADER for a variety of errors, and G_WRONG_MECH if the

 * mechanism in the token does not match the mech argument.  buf and

 * *body_size are left unmodified on error.

 */

u32

g_verify_token_header(struct xdr_netobj *mech, int *body_size,

		      unsigned char **buf_in, int toksize)

{

	unsigned char *buf = *buf_in;

	int seqsize;

	struct xdr_netobj toid;

	int ret = 0;



	if ((toksize-=1) < 0)

		return G_BAD_TOK_HEADER;

	if (*buf++ != 0x60)

		return G_BAD_TOK_HEADER;



	if ((seqsize = der_read_length(&buf, &toksize)) < 0)

		return G_BAD_TOK_HEADER;



	if (seqsize != toksize)

		return G_BAD_TOK_HEADER;



	if ((toksize-=1) < 0)

		return G_BAD_TOK_HEADER;

	if (*buf++ != 0x06)

		return G_BAD_TOK_HEADER;



	if ((toksize-=1) < 0)

		return G_BAD_TOK_HEADER;

	toid.len = *buf++;



	if ((toksize-=toid.len) < 0)

		return G_BAD_TOK_HEADER;

	toid.data = buf;

	buf+=toid.len;



	if (! g_OID_equal(&toid, mech))

		ret = G_WRONG_MECH;



   /* G_WRONG_MECH is not returned immediately because it's more important

      to return G_BAD_TOK_HEADER if the token header is in fact bad */



	if ((toksize-=2) < 0)

		return G_BAD_TOK_HEADER;



	if (ret)

		return ret;



	*buf_in = buf;

	*body_size = toksize;



	return ret;

}



EXPORT_SYMBOL_GPL(g_verify_token_header);

net/sunrpc/auth_gss/gss_mech_switch.c

+0 −1
Original line number Diff line number Diff line
@@ -13,7 +13,6 @@ 
#include <linux/module.h>

#include <linux/oid_registry.h>

#include <linux/sunrpc/msg_prot.h>

#include <linux/sunrpc/gss_asn1.h>

#include <linux/sunrpc/auth_gss.h>

#include <linux/sunrpc/svcauth_gss.h>

#include <linux/sunrpc/gss_err.h>