diff options
author | Shane Lontis <shane.lontis@oracle.com> | 2021-03-09 11:53:33 +1000 |
---|---|---|
committer | Shane Lontis <shane.lontis@oracle.com> | 2021-03-18 17:52:37 +1000 |
commit | 8a6e9125200223fa2294d3634d3dfec24857264b (patch) | |
tree | 456f123f76f8d213acc195450d4a8502cd2fda23 /providers | |
parent | 7bbadfc15a446134d15d8fd0aa5362628b8c96be (diff) |
Add ossl_ symbols for sm3 and sm4
Partial fix for #12964
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14473)
Diffstat (limited to 'providers')
-rw-r--r-- | providers/implementations/ciphers/cipher_sm4_hw.c | 6 | ||||
-rw-r--r-- | providers/implementations/digests/sm3_prov.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/providers/implementations/ciphers/cipher_sm4_hw.c b/providers/implementations/ciphers/cipher_sm4_hw.c index 5cfa81d46f..e370574384 100644 --- a/providers/implementations/ciphers/cipher_sm4_hw.c +++ b/providers/implementations/ciphers/cipher_sm4_hw.c @@ -15,14 +15,14 @@ static int cipher_hw_sm4_initkey(PROV_CIPHER_CTX *ctx, PROV_SM4_CTX *sctx = (PROV_SM4_CTX *)ctx; SM4_KEY *ks = &sctx->ks.ks; - SM4_set_key(key, ks); + ossl_sm4_set_key(key, ks); ctx->ks = ks; if (ctx->enc || (ctx->mode != EVP_CIPH_ECB_MODE && ctx->mode != EVP_CIPH_CBC_MODE)) - ctx->block = (block128_f)SM4_encrypt; + ctx->block = (block128_f)ossl_sm4_encrypt; else - ctx->block = (block128_f)SM4_decrypt; + ctx->block = (block128_f)ossl_sm4_decrypt; return 1; } diff --git a/providers/implementations/digests/sm3_prov.c b/providers/implementations/digests/sm3_prov.c index fec3dcbef3..0de38f2e15 100644 --- a/providers/implementations/digests/sm3_prov.c +++ b/providers/implementations/digests/sm3_prov.c @@ -15,4 +15,4 @@ /* ossl_sm3_functions */ IMPLEMENT_digest_functions(sm3, SM3_CTX, SM3_CBLOCK, SM3_DIGEST_LENGTH, 0, - sm3_init, sm3_update, sm3_final) + ossl_sm3_init, ossl_sm3_update, ossl_sm3_final) |