Commit a83ed225 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'linux-kselftest-fixes-5.14-rc6' of... 

Merge tag 'linux-kselftest-fixes-5.14-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest

Pull Kselftest fix from Shuah Khan:
 "A single patch to sgx test to fix Q1 and Q2 calculation"

* tag 'linux-kselftest-fixes-5.14-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest:
  selftests/sgx: Fix Q1 and Q2 calculation in sigstruct.c
parents 020efdad 567c3904

tools/testing/selftests/sgx/sigstruct.c

+21 −20
Original line number Diff line number Diff line
@@ -55,10 +55,27 @@ static bool alloc_q1q2_ctx(const uint8_t *s, const uint8_t *m, 
	return true;

}



static void reverse_bytes(void *data, int length)

{

	int i = 0;

	int j = length - 1;

	uint8_t temp;

	uint8_t *ptr = data;



	while (i < j) {

		temp = ptr[i];

		ptr[i] = ptr[j];

		ptr[j] = temp;

		i++;

		j--;

	}

}



static bool calc_q1q2(const uint8_t *s, const uint8_t *m, uint8_t *q1,

		      uint8_t *q2)

{

	struct q1q2_ctx ctx;

	int len;



	if (!alloc_q1q2_ctx(s, m, &ctx)) {

		fprintf(stderr, "Not enough memory for Q1Q2 calculation\n");
@@ -89,8 +106,10 @@ static bool calc_q1q2(const uint8_t *s, const uint8_t *m, uint8_t *q1, 
		goto out;

	}



	BN_bn2bin(ctx.q1, q1);

	BN_bn2bin(ctx.q2, q2);

	len = BN_bn2bin(ctx.q1, q1);

	reverse_bytes(q1, len);

	len = BN_bn2bin(ctx.q2, q2);

	reverse_bytes(q2, len);



	free_q1q2_ctx(&ctx);

	return true;
@@ -152,22 +171,6 @@ static RSA *gen_sign_key(void) 
	return key;

}



static void reverse_bytes(void *data, int length)

{

	int i = 0;

	int j = length - 1;

	uint8_t temp;

	uint8_t *ptr = data;



	while (i < j) {

		temp = ptr[i];

		ptr[i] = ptr[j];

		ptr[j] = temp;

		i++;

		j--;

	}

}



enum mrtags {

	MRECREATE = 0x0045544145524345,

	MREADD = 0x0000000044444145,
@@ -367,8 +370,6 @@ bool encl_measure(struct encl *encl) 
	/* BE -> LE */

	reverse_bytes(sigstruct->signature, SGX_MODULUS_SIZE);

	reverse_bytes(sigstruct->modulus, SGX_MODULUS_SIZE);

	reverse_bytes(sigstruct->q1, SGX_MODULUS_SIZE);

	reverse_bytes(sigstruct->q2, SGX_MODULUS_SIZE);



	EVP_MD_CTX_destroy(ctx);

	RSA_free(key);