From f0c37b1bb165e083e64176906285e095da0ca1b7 Mon Sep 17 00:00:00 2001 From: Dmytro Bogovych Date: Sun, 10 Nov 2024 13:21:10 +0300 Subject: [PATCH] - rename sha1_init / sha1_update / sha1_free with prefix srtp_ to resolve multiple symbol error with libzmq --- src/libs/srtp/crypto/hash/hmac.c | 16 ++++++++-------- src/libs/srtp/crypto/hash/sha1.c | 12 ++++++------ src/libs/srtp/crypto/include/sha1.h | 8 ++++---- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/libs/srtp/crypto/hash/hmac.c b/src/libs/srtp/crypto/hash/hmac.c index 4f389fe1..d842522a 100644 --- a/src/libs/srtp/crypto/hash/hmac.c +++ b/src/libs/srtp/crypto/hash/hmac.c @@ -137,10 +137,10 @@ hmac_init(hmac_ctx_t *state, const uint8_t *key, int key_len) { debug_print(mod_hmac, "ipad: %s", octet_string_hex_string(ipad, 64)); /* initialize sha1 context */ - sha1_init(&state->init_ctx); + srtp_sha1_init(&state->init_ctx); /* hash ipad ^ key */ - sha1_update(&state->init_ctx, ipad, 64); + srtp_sha1_update(&state->init_ctx, ipad, 64); memcpy(&state->ctx, &state->init_ctx, sizeof(sha1_ctx_t)); return err_status_ok; @@ -161,7 +161,7 @@ hmac_update(hmac_ctx_t *state, const uint8_t *message, int msg_octets) { octet_string_hex_string(message, msg_octets)); /* hash message into sha1 context */ - sha1_update(&state->ctx, message, msg_octets); + srtp_sha1_update(&state->ctx, message, msg_octets); return err_status_ok; } @@ -179,7 +179,7 @@ hmac_compute(hmac_ctx_t *state, const void *message, /* hash message, copy output into H */ hmac_update(state, (const uint8_t*)message, msg_octets); - sha1_final(&state->ctx, H); + srtp_sha1_final(&state->ctx, H); /* * note that we don't need to debug_print() the input, since the @@ -189,16 +189,16 @@ hmac_compute(hmac_ctx_t *state, const void *message, octet_string_hex_string((uint8_t *)H, 20)); /* re-initialize hash context */ - sha1_init(&state->ctx); + srtp_sha1_init(&state->ctx); /* hash opad ^ key */ - sha1_update(&state->ctx, (uint8_t *)state->opad, 64); + srtp_sha1_update(&state->ctx, (uint8_t *)state->opad, 64); /* hash the result of the inner hash */ - sha1_update(&state->ctx, (uint8_t *)H, 20); + srtp_sha1_update(&state->ctx, (uint8_t *)H, 20); /* the result is returned in the array hash_value[] */ - sha1_final(&state->ctx, hash_value); + srtp_sha1_final(&state->ctx, hash_value); /* copy hash_value to *result */ for (i=0; i < tag_len; i++) diff --git a/src/libs/srtp/crypto/hash/sha1.c b/src/libs/srtp/crypto/hash/sha1.c index b9a8d105..afbbc04c 100644 --- a/src/libs/srtp/crypto/hash/sha1.c +++ b/src/libs/srtp/crypto/hash/sha1.c @@ -77,9 +77,9 @@ void sha1(const uint8_t *msg, int octets_in_msg, uint32_t hash_value[5]) { sha1_ctx_t ctx; - sha1_init(&ctx); - sha1_update(&ctx, msg, octets_in_msg); - sha1_final(&ctx, hash_value); + srtp_sha1_init(&ctx); + srtp_sha1_update(&ctx, msg, octets_in_msg); + srtp_sha1_final(&ctx, hash_value); } @@ -183,7 +183,7 @@ sha1_core(const uint32_t M[16], uint32_t hash_value[5]) { } void -sha1_init(sha1_ctx_t *ctx) { +srtp_sha1_init(sha1_ctx_t *ctx) { /* initialize state vector */ ctx->H[0] = 0x67452301; @@ -201,7 +201,7 @@ sha1_init(sha1_ctx_t *ctx) { } void -sha1_update(sha1_ctx_t *ctx, const uint8_t *msg, int octets_in_msg) { +srtp_sha1_update(sha1_ctx_t *ctx, const uint8_t *msg, int octets_in_msg) { int i; uint8_t *buf = (uint8_t *)ctx->M; @@ -249,7 +249,7 @@ sha1_update(sha1_ctx_t *ctx, const uint8_t *msg, int octets_in_msg) { */ void -sha1_final(sha1_ctx_t *ctx, uint32_t *output) { +srtp_sha1_final(sha1_ctx_t *ctx, uint32_t *output) { uint32_t A, B, C, D, E, TEMP; uint32_t W[80]; int i, t; diff --git a/src/libs/srtp/crypto/include/sha1.h b/src/libs/srtp/crypto/include/sha1.h index e3af4d4b..0bf5a96d 100644 --- a/src/libs/srtp/crypto/include/sha1.h +++ b/src/libs/srtp/crypto/include/sha1.h @@ -68,7 +68,7 @@ void sha1(const uint8_t *message, int octets_in_msg, uint32_t output[5]); /* - * sha1_init(&ctx) initializes the SHA1 context ctx + * srtp_sha1_init(&ctx) initializes the SHA1 context ctx * * sha1_update(&ctx, msg, len) hashes the len octets starting at msg * into the SHA1 context @@ -79,13 +79,13 @@ sha1(const uint8_t *message, int octets_in_msg, uint32_t output[5]); */ void -sha1_init(sha1_ctx_t *ctx); +srtp_sha1_init(sha1_ctx_t *ctx); void -sha1_update(sha1_ctx_t *ctx, const uint8_t *M, int octets_in_msg); +srtp_sha1_update(sha1_ctx_t *ctx, const uint8_t *M, int octets_in_msg); void -sha1_final(sha1_ctx_t *ctx, uint32_t output[5]); +srtp_sha1_final(sha1_ctx_t *ctx, uint32_t output[5]); /* * The sha1_core function is INTERNAL to SHA-1, but it is declared