diff options
| author | Shane Lontis <shane.lontis@oracle.com> | 2021-03-09 11:47:48 +1000 |
|---|---|---|
| committer | Shane Lontis <shane.lontis@oracle.com> | 2021-03-18 17:52:37 +1000 |
| commit | 78f32a316589c93bfbb06cb58d996a39c3f43678 (patch) | |
| tree | fc03a1d106a8619d61f6c3ffd89a7e68d69e20ac /providers | |
| parent | f148f7034c9e2f9155ca4a8e51cbe7af02f8600a (diff) | |
Add ossl_aria symbols
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_aria_ccm_hw.c | 4 | ||||
| -rw-r--r-- | providers/implementations/ciphers/cipher_aria_gcm_hw.c | 2 | ||||
| -rw-r--r-- | providers/implementations/ciphers/cipher_aria_hw.c | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/providers/implementations/ciphers/cipher_aria_ccm_hw.c b/providers/implementations/ciphers/cipher_aria_ccm_hw.c index 700958cbac..e56ec8fb08 100644 --- a/providers/implementations/ciphers/cipher_aria_ccm_hw.c +++ b/providers/implementations/ciphers/cipher_aria_ccm_hw.c @@ -18,9 +18,9 @@ static int ccm_aria_initkey(PROV_CCM_CTX *ctx, { PROV_ARIA_CCM_CTX *actx = (PROV_ARIA_CCM_CTX *)ctx; - aria_set_encrypt_key(key, keylen * 8, &actx->ks.ks); + ossl_aria_set_encrypt_key(key, keylen * 8, &actx->ks.ks); CRYPTO_ccm128_init(&ctx->ccm_ctx, ctx->m, ctx->l, &actx->ks.ks, - (block128_f)aria_encrypt); + (block128_f)ossl_aria_encrypt); ctx->str = NULL; ctx->key_set = 1; return 1; diff --git a/providers/implementations/ciphers/cipher_aria_gcm_hw.c b/providers/implementations/ciphers/cipher_aria_gcm_hw.c index d5f211a484..927327c29c 100644 --- a/providers/implementations/ciphers/cipher_aria_gcm_hw.c +++ b/providers/implementations/ciphers/cipher_aria_gcm_hw.c @@ -19,7 +19,7 @@ static int aria_gcm_initkey(PROV_GCM_CTX *ctx, const unsigned char *key, PROV_ARIA_GCM_CTX *actx = (PROV_ARIA_GCM_CTX *)ctx; ARIA_KEY *ks = &actx->ks.ks; - GCM_HW_SET_KEY_CTR_FN(ks, aria_set_encrypt_key, aria_encrypt, NULL); + GCM_HW_SET_KEY_CTR_FN(ks, ossl_aria_set_encrypt_key, ossl_aria_encrypt, NULL); return 1; } diff --git a/providers/implementations/ciphers/cipher_aria_hw.c b/providers/implementations/ciphers/cipher_aria_hw.c index 8e114b3ba1..425d87a65e 100644 --- a/providers/implementations/ciphers/cipher_aria_hw.c +++ b/providers/implementations/ciphers/cipher_aria_hw.c @@ -18,15 +18,15 @@ static int cipher_hw_aria_initkey(PROV_CIPHER_CTX *dat, ARIA_KEY *ks = &adat->ks.ks; if (dat->enc || (mode != EVP_CIPH_ECB_MODE && mode != EVP_CIPH_CBC_MODE)) - ret = aria_set_encrypt_key(key, keylen * 8, ks); + ret = ossl_aria_set_encrypt_key(key, keylen * 8, ks); else - ret = aria_set_decrypt_key(key, keylen * 8, ks); + ret = ossl_aria_set_decrypt_key(key, keylen * 8, ks); if (ret < 0) { ERR_raise(ERR_LIB_PROV, PROV_R_KEY_SETUP_FAILED); return 0; } dat->ks = ks; - dat->block = (block128_f)aria_encrypt; + dat->block = (block128_f)ossl_aria_encrypt; return 1; } |