Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 30aef316 authored by Kevin Coffman's avatar Kevin Coffman Committed by J. Bruce Fields
Browse files

Remove define for KRB5_CKSUM_LENGTH, which will become enctype-dependent 



cleanup: When adding new encryption types, the checksum length
can be different for each enctype.  Face the fact that the
current code only supports DES which has a checksum length of 8.

Signed-off-by: default avatarKevin Coffman <kwc@citi.umich.edu>
Signed-off-by: default avatarJ. Bruce Fields <bfields@citi.umich.edu>
parent 3d4a6886

include/linux/sunrpc/gss_krb5.h

+0 −2
Original line number Diff line number Diff line
@@ -70,8 +70,6 @@ enum seal_alg { 
	SEAL_ALG_DES3KD = 0x0002

};



#define KRB5_CKSUM_LENGTH 8



#define CKSUMTYPE_CRC32			0x0001

#define CKSUMTYPE_RSA_MD4		0x0002

#define CKSUMTYPE_RSA_MD4_DES		0x0003

net/sunrpc/auth_gss/gss_krb5_seal.c

+1 −2
Original line number Diff line number Diff line
@@ -109,8 +109,7 @@ gss_get_mic_kerberos(struct gss_ctx *gss_ctx, struct xdr_buf *text, 
			  md5cksum.data, md5cksum.len))

		return GSS_S_FAILURE;



	memcpy(krb5_hdr + 16, md5cksum.data + md5cksum.len - KRB5_CKSUM_LENGTH,

	       KRB5_CKSUM_LENGTH);

	memcpy(krb5_hdr + 16, md5cksum.data + md5cksum.len - 8, 8);



	spin_lock(&krb5_seq_lock);

	seq_send = ctx->seq_send++;

net/sunrpc/auth_gss/gss_krb5_wrap.c

+1 −3
Original line number Diff line number Diff line
@@ -176,9 +176,7 @@ gss_wrap_kerberos(struct gss_ctx *ctx, int offset, 
	if (krb5_encrypt(kctx->seq, NULL, md5cksum.data,

			  md5cksum.data, md5cksum.len))

		return GSS_S_FAILURE;

	memcpy(krb5_hdr + 16,

	       md5cksum.data + md5cksum.len - KRB5_CKSUM_LENGTH,

	       KRB5_CKSUM_LENGTH);

	memcpy(krb5_hdr + 16, md5cksum.data + md5cksum.len - 8, 8);



	spin_lock(&krb5_seq_lock);

	seq_send = kctx->seq_send++;