Skip to content

Commit 66a4467

Browse files
committed
digest: add 'xof' and 'algid-absent' parameters
1 parent c3a8758 commit 66a4467

File tree

2 files changed

+12
-0
lines changed

2 files changed

+12
-0
lines changed

src/tpm2-provider-digest.c

+11
Original file line numberDiff line numberDiff line change
@@ -308,6 +308,8 @@ tpm2_digest_gettable_params(void *provctx)
308308
static const OSSL_PARAM known_gettable_params[] = {
309309
OSSL_PARAM_size_t(OSSL_DIGEST_PARAM_BLOCK_SIZE, NULL),
310310
OSSL_PARAM_size_t(OSSL_DIGEST_PARAM_SIZE, NULL),
311+
OSSL_PARAM_int(OSSL_DIGEST_PARAM_XOF, NULL),
312+
OSSL_PARAM_int(OSSL_DIGEST_PARAM_ALGID_ABSENT, NULL),
311313
OSSL_PARAM_END
312314
};
313315
return known_gettable_params;
@@ -329,6 +331,15 @@ tpm2_digest_get_params_int(OSSL_PARAM params[], size_t block, size_t size)
329331
if (p != NULL && !OSSL_PARAM_set_size_t(p, size))
330332
return 0;
331333

334+
/* OSSL_DIGEST_PARAM_XOFLEN is never supported */
335+
p = OSSL_PARAM_locate(params, OSSL_DIGEST_PARAM_XOF);
336+
if (p != NULL && !OSSL_PARAM_set_int(p, 0))
337+
return 0;
338+
339+
p = OSSL_PARAM_locate(params, OSSL_DIGEST_PARAM_ALGID_ABSENT);
340+
if (p != NULL && !OSSL_PARAM_set_int(p, 0))
341+
return 0;
342+
332343
return 1;
333344
}
334345

src/tpm2-provider-types.c

+1
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ static const hash_names_t hashes[] = {
3030
{ "SHA512", TPM2_ALG_SHA512 },
3131
{ "SHA-512", TPM2_ALG_SHA512 },
3232
{ "SHA2-512", TPM2_ALG_SHA512 },
33+
{ "SM3", TPM2_ALG_SM3_256 },
3334
{ NULL, TPM2_ALG_ERROR }
3435
};
3536

0 commit comments

Comments
 (0)