summaryrefslogtreecommitdiffstats
path: root/crypto/aria/aria.c
diff options
context:
space:
mode:
authorShane Lontis <shane.lontis@oracle.com>2021-03-09 02:47:48 +0100
committerShane Lontis <shane.lontis@oracle.com>2021-03-18 08:52:37 +0100
commit78f32a316589c93bfbb06cb58d996a39c3f43678 (patch)
treefc03a1d106a8619d61f6c3ffd89a7e68d69e20ac /crypto/aria/aria.c
parentAdd ossl_ conf symbols (diff)
downloadopenssl-78f32a316589c93bfbb06cb58d996a39c3f43678.tar.xz
openssl-78f32a316589c93bfbb06cb58d996a39c3f43678.zip
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 'crypto/aria/aria.c')
-rw-r--r--crypto/aria/aria.c28
1 files changed, 14 insertions, 14 deletions
diff --git a/crypto/aria/aria.c b/crypto/aria/aria.c
index c1b2254af7..dabc843324 100644
--- a/crypto/aria/aria.c
+++ b/crypto/aria/aria.c
@@ -468,8 +468,8 @@ static const uint32_t X2[256] = {
(Y) = (TMP2) ^ rotr32((TMP) ^ (TMP2), 16); \
} while(0)
-void aria_encrypt(const unsigned char *in, unsigned char *out,
- const ARIA_KEY *key)
+void ossl_aria_encrypt(const unsigned char *in, unsigned char *out,
+ const ARIA_KEY *key)
{
register uint32_t reg0, reg1, reg2, reg3;
int Nr;
@@ -535,8 +535,8 @@ void aria_encrypt(const unsigned char *in, unsigned char *out,
PUT_U32_BE(out, 3, reg3);
}
-int aria_set_encrypt_key(const unsigned char *userKey, const int bits,
- ARIA_KEY *key)
+int ossl_aria_set_encrypt_key(const unsigned char *userKey, const int bits,
+ ARIA_KEY *key)
{
register uint32_t reg0, reg1, reg2, reg3;
uint32_t w0[4], w1[4], w2[4], w3[4];
@@ -667,8 +667,8 @@ int aria_set_encrypt_key(const unsigned char *userKey, const int bits,
return 0;
}
-int aria_set_decrypt_key(const unsigned char *userKey, const int bits,
- ARIA_KEY *key)
+int ossl_aria_set_decrypt_key(const unsigned char *userKey, const int bits,
+ ARIA_KEY *key)
{
ARIA_u128 *rk_head;
ARIA_u128 *rk_tail;
@@ -676,7 +676,7 @@ int aria_set_decrypt_key(const unsigned char *userKey, const int bits,
register uint32_t reg0, reg1, reg2, reg3;
uint32_t s0, s1, s2, s3;
- const int r = aria_set_encrypt_key(userKey, bits, key);
+ const int r = ossl_aria_set_encrypt_key(userKey, bits, key);
if (r != 0) {
return r;
@@ -1106,8 +1106,8 @@ static void do_encrypt(unsigned char *o, const unsigned char *pin,
* Encrypt a single block
* in and out can overlap
*/
-void aria_encrypt(const unsigned char *in, unsigned char *out,
- const ARIA_KEY *key)
+void ossl_aria_encrypt(const unsigned char *in, unsigned char *out,
+ const ARIA_KEY *key)
{
assert(in != NULL && out != NULL && key != NULL);
do_encrypt(out, in, key->rounds, key->rd_key);
@@ -1119,8 +1119,8 @@ void aria_encrypt(const unsigned char *in, unsigned char *out,
* We short circuit execution of the last two
* or four rotations based on the key size.
*/
-int aria_set_encrypt_key(const unsigned char *userKey, const int bits,
- ARIA_KEY *key)
+int ossl_aria_set_encrypt_key(const unsigned char *userKey, const int bits,
+ ARIA_KEY *key)
{
const ARIA_u128 *ck1, *ck2, *ck3;
ARIA_u128 kr, w0, w1, w2, w3;
@@ -1192,11 +1192,11 @@ int aria_set_encrypt_key(const unsigned char *userKey, const int bits,
/*
* Expand the cipher key into the decryption key schedule.
*/
-int aria_set_decrypt_key(const unsigned char *userKey, const int bits,
- ARIA_KEY *key)
+int ossl_aria_set_decrypt_key(const unsigned char *userKey, const int bits,
+ ARIA_KEY *key)
{
ARIA_KEY ek;
- const int r = aria_set_encrypt_key(userKey, bits, &ek);
+ const int r = ossl_aria_set_encrypt_key(userKey, bits, &ek);
unsigned int i, rounds = ek.rounds;
if (r == 0) {