diff --git a/sflphone-common/libs/iax2/iax.c b/sflphone-common/libs/iax2/iax.c
index 5c184a1de6727ce75b0ed00ffa588b593cbeb4d1..67f9db7b0de8292232075eed9c72456cdde5aacf 100644
--- a/sflphone-common/libs/iax2/iax.c
+++ b/sflphone-common/libs/iax2/iax.c
@@ -1889,17 +1889,17 @@ static int iax_send_txready(struct iax_session *session)
int iax_auth_reply(struct iax_session *session, char *password, char *challenge, int methods)
{
char reply[16];
- struct MD5Context md5;
+ struct IAX_MD5Context md5;
char realreply[256];
struct iax_ie_data ied;
memset(&ied, 0, sizeof(ied));
if ((methods & IAX_AUTH_MD5) && challenge) {
- MD5Init(&md5);
- MD5Update(&md5, (const unsigned char *) challenge,
+ IAX_MD5Init(&md5);
+ IAX_MD5Update(&md5, (const unsigned char *) challenge,
(unsigned int)strlen(challenge));
- MD5Update(&md5, (const unsigned char *) password,
+ IAX_MD5Update(&md5, (const unsigned char *) password,
(unsigned int)strlen(password));
- MD5Final((unsigned char *) reply, &md5);
+ IAX_MD5Final((unsigned char *) reply, &md5);
memset(realreply, 0, sizeof(realreply));
convert_reply(realreply, (unsigned char *) reply);
iax_ie_append_str(&ied, IAX_IE_MD5_RESULT, realreply);
@@ -1912,19 +1912,19 @@ int iax_auth_reply(struct iax_session *session, char *password, char *challenge,
static int iax_regauth_reply(struct iax_session *session, char *password, char *challenge, int methods)
{
char reply[16];
- struct MD5Context md5;
+ struct IAX_MD5Context md5;
char realreply[256];
struct iax_ie_data ied;
memset(&ied, 0, sizeof(ied));
iax_ie_append_str(&ied, IAX_IE_USERNAME, session->username);
iax_ie_append_short(&ied, IAX_IE_REFRESH, session->refresh);
if ((methods & IAX_AUTHMETHOD_MD5) && challenge) {
- MD5Init(&md5);
- MD5Update(&md5, (const unsigned char *) challenge,
+ IAX_MD5Init(&md5);
+ IAX_MD5Update(&md5, (const unsigned char *) challenge,
(unsigned int)strlen(challenge));
- MD5Update(&md5, (const unsigned char *) password,
+ IAX_MD5Update(&md5, (const unsigned char *) password,
(unsigned int)strlen(password));
- MD5Final((unsigned char *) reply, &md5);
+ IAX_MD5Final((unsigned char *) reply, &md5);
memset(realreply, 0, sizeof(realreply));
convert_reply(realreply, (unsigned char *) reply);
iax_ie_append_str(&ied, IAX_IE_MD5_RESULT, realreply);
diff --git a/sflphone-common/libs/iax2/md5.c b/sflphone-common/libs/iax2/md5.c
index 401216ee27167b9e048cdcaa7831e65aed7bb303..56382221c44102643e3c38482b8b826cd716b52d 100644
--- a/sflphone-common/libs/iax2/md5.c
+++ b/sflphone-common/libs/iax2/md5.c
@@ -51,15 +51,15 @@
#include "md5.h"
#ifndef HIGHFIRST
-#define byteReverse(buf, len) /* Nothing */
+#define IAX_byteReverse(buf, len) /* Nothing */
#else
-void byteReverse(uint8_t *buf, unsigned int longs);
+void IAX_byteReverse(uint8_t *buf, unsigned int longs);
#ifndef ASM_MD5
/*
* Note: this code is harmless on little-endian machines.
*/
-void byteReverse(uint8_t *buf, unsigned int longs)
+void IAX_byteReverse(uint8_t *buf, unsigned int longs)
{
uint32_t t;
do {
@@ -76,7 +76,7 @@ void byteReverse(uint8_t *buf, unsigned int longs)
* Start MD5 accumulation. Set bit count to 0 and buffer to mysterious
* initialization constants.
*/
-void MD5Init(struct MD5Context *ctx)
+void IAX_MD5Init(struct IAX_MD5Context *ctx)
{
ctx->buf[0] = 0x67452301;
ctx->buf[1] = 0xefcdab89;
@@ -91,7 +91,7 @@ void MD5Init(struct MD5Context *ctx)
* Update context to reflect the concatenation of another buffer full
* of bytes.
*/
-void MD5Update(struct MD5Context *ctx, uint8_t const *buf, unsigned int len)
+void IAX_MD5Update(struct IAX_MD5Context *ctx, uint8_t const *buf, unsigned int len)
{
uint32_t t;
@@ -115,8 +115,8 @@ void MD5Update(struct MD5Context *ctx, uint8_t const *buf, unsigned int len)
return;
}
memcpy(p, buf, t);
- byteReverse(ctx->in, 16);
- MD5Transform(ctx->buf, (uint32_t *) ctx->in);
+ IAX_byteReverse(ctx->in, 16);
+ IAX_MD5Transform(ctx->buf, (uint32_t *) ctx->in);
buf += t;
len -= t;
}
@@ -124,8 +124,8 @@ void MD5Update(struct MD5Context *ctx, uint8_t const *buf, unsigned int len)
while (len >= 64) {
memcpy(ctx->in, buf, 64);
- byteReverse(ctx->in, 16);
- MD5Transform(ctx->buf, (uint32_t *) ctx->in);
+ IAX_byteReverse(ctx->in, 16);
+ IAX_MD5Transform(ctx->buf, (uint32_t *) ctx->in);
buf += 64;
len -= 64;
}
@@ -139,7 +139,7 @@ void MD5Update(struct MD5Context *ctx, uint8_t const *buf, unsigned int len)
* Final wrapup - pad to 64-byte boundary with the bit pattern
* 1 0* (64-bit count of bits processed, MSB-first)
*/
-void MD5Final(uint8_t digest[16], struct MD5Context *ctx)
+void IAX_MD5Final(uint8_t digest[16], struct IAX_MD5Context *ctx)
{
unsigned int count;
uint8_t *p;
@@ -159,8 +159,8 @@ void MD5Final(uint8_t digest[16], struct MD5Context *ctx)
if (count < 8) {
/* Two lots of padding: Pad the first block to 64 bytes */
memset(p, 0, count);
- byteReverse(ctx->in, 16);
- MD5Transform(ctx->buf, (uint32_t *) ctx->in);
+ IAX_byteReverse(ctx->in, 16);
+ IAX_MD5Transform(ctx->buf, (uint32_t *) ctx->in);
/* Now fill the next block with 56 bytes */
memset(ctx->in, 0, 56);
@@ -168,30 +168,30 @@ void MD5Final(uint8_t digest[16], struct MD5Context *ctx)
/* Pad block to 56 bytes */
memset(p, 0, count - 8);
}
- byteReverse(ctx->in, 14);
+ IAX_byteReverse(ctx->in, 14);
/* Append length in bits and transform */
((uint32_t *) ctx->in)[14] = ctx->bits[0];
((uint32_t *) ctx->in)[15] = ctx->bits[1];
- MD5Transform(ctx->buf, (uint32_t *) ctx->in);
- byteReverse((uint8_t *) ctx->buf, 4);
+ IAX_MD5Transform(ctx->buf, (uint32_t *) ctx->in);
+ IAX_byteReverse((uint8_t *) ctx->buf, 4);
memcpy(digest, ctx->buf, 16);
memset(ctx, 0, sizeof(ctx)); /* In case it's sensitive */
}
#ifndef ASM_MD5
-/* The four core functions - F1 is optimized somewhat */
+/* The four core functions - IAX_F1 is optimized somewhat */
-/* #define F1(x, y, z) (x & y | ~x & z) */
-#define F1(x, y, z) (z ^ (x & (y ^ z)))
-#define F2(x, y, z) F1(z, x, y)
-#define F3(x, y, z) (x ^ y ^ z)
-#define F4(x, y, z) (y ^ (x | ~z))
+/* #define IAX_F1(x, y, z) (x & y | ~x & z) */
+#define IAX_F1(x, y, z) (z ^ (x & (y ^ z)))
+#define IAX_F2(x, y, z) IAX_F1(z, x, y)
+#define IAX_F3(x, y, z) (x ^ y ^ z)
+#define IAX_F4(x, y, z) (y ^ (x | ~z))
/* This is the central step in the MD5 algorithm. */
-#define MD5STEP(f, w, x, y, z, data, s) \
+#define IAX_MD5STEP(f, w, x, y, z, data, s) \
( w += f(x, y, z) + data, w = w<<s | w>>(32-s), w += x )
/*
@@ -199,7 +199,7 @@ void MD5Final(uint8_t digest[16], struct MD5Context *ctx)
* reflect the addition of 16 longwords of new data. MD5Update blocks
* the data and converts bytes into longwords for this routine.
*/
-void MD5Transform(uint32_t buf[4], uint32_t const in[16])
+void IAX_MD5Transform(uint32_t buf[4], uint32_t const in[16])
{
uint32_t a, b, c, d;
@@ -208,73 +208,73 @@ void MD5Transform(uint32_t buf[4], uint32_t const in[16])
c = buf[2];
d = buf[3];
- MD5STEP(F1, a, b, c, d, in[0] + 0xd76aa478, 7);
- MD5STEP(F1, d, a, b, c, in[1] + 0xe8c7b756, 12);
- MD5STEP(F1, c, d, a, b, in[2] + 0x242070db, 17);
- MD5STEP(F1, b, c, d, a, in[3] + 0xc1bdceee, 22);
- MD5STEP(F1, a, b, c, d, in[4] + 0xf57c0faf, 7);
- MD5STEP(F1, d, a, b, c, in[5] + 0x4787c62a, 12);
- MD5STEP(F1, c, d, a, b, in[6] + 0xa8304613, 17);
- MD5STEP(F1, b, c, d, a, in[7] + 0xfd469501, 22);
- MD5STEP(F1, a, b, c, d, in[8] + 0x698098d8, 7);
- MD5STEP(F1, d, a, b, c, in[9] + 0x8b44f7af, 12);
- MD5STEP(F1, c, d, a, b, in[10] + 0xffff5bb1, 17);
- MD5STEP(F1, b, c, d, a, in[11] + 0x895cd7be, 22);
- MD5STEP(F1, a, b, c, d, in[12] + 0x6b901122, 7);
- MD5STEP(F1, d, a, b, c, in[13] + 0xfd987193, 12);
- MD5STEP(F1, c, d, a, b, in[14] + 0xa679438e, 17);
- MD5STEP(F1, b, c, d, a, in[15] + 0x49b40821, 22);
-
- MD5STEP(F2, a, b, c, d, in[1] + 0xf61e2562, 5);
- MD5STEP(F2, d, a, b, c, in[6] + 0xc040b340, 9);
- MD5STEP(F2, c, d, a, b, in[11] + 0x265e5a51, 14);
- MD5STEP(F2, b, c, d, a, in[0] + 0xe9b6c7aa, 20);
- MD5STEP(F2, a, b, c, d, in[5] + 0xd62f105d, 5);
- MD5STEP(F2, d, a, b, c, in[10] + 0x02441453, 9);
- MD5STEP(F2, c, d, a, b, in[15] + 0xd8a1e681, 14);
- MD5STEP(F2, b, c, d, a, in[4] + 0xe7d3fbc8, 20);
- MD5STEP(F2, a, b, c, d, in[9] + 0x21e1cde6, 5);
- MD5STEP(F2, d, a, b, c, in[14] + 0xc33707d6, 9);
- MD5STEP(F2, c, d, a, b, in[3] + 0xf4d50d87, 14);
- MD5STEP(F2, b, c, d, a, in[8] + 0x455a14ed, 20);
- MD5STEP(F2, a, b, c, d, in[13] + 0xa9e3e905, 5);
- MD5STEP(F2, d, a, b, c, in[2] + 0xfcefa3f8, 9);
- MD5STEP(F2, c, d, a, b, in[7] + 0x676f02d9, 14);
- MD5STEP(F2, b, c, d, a, in[12] + 0x8d2a4c8a, 20);
-
- MD5STEP(F3, a, b, c, d, in[5] + 0xfffa3942, 4);
- MD5STEP(F3, d, a, b, c, in[8] + 0x8771f681, 11);
- MD5STEP(F3, c, d, a, b, in[11] + 0x6d9d6122, 16);
- MD5STEP(F3, b, c, d, a, in[14] + 0xfde5380c, 23);
- MD5STEP(F3, a, b, c, d, in[1] + 0xa4beea44, 4);
- MD5STEP(F3, d, a, b, c, in[4] + 0x4bdecfa9, 11);
- MD5STEP(F3, c, d, a, b, in[7] + 0xf6bb4b60, 16);
- MD5STEP(F3, b, c, d, a, in[10] + 0xbebfbc70, 23);
- MD5STEP(F3, a, b, c, d, in[13] + 0x289b7ec6, 4);
- MD5STEP(F3, d, a, b, c, in[0] + 0xeaa127fa, 11);
- MD5STEP(F3, c, d, a, b, in[3] + 0xd4ef3085, 16);
- MD5STEP(F3, b, c, d, a, in[6] + 0x04881d05, 23);
- MD5STEP(F3, a, b, c, d, in[9] + 0xd9d4d039, 4);
- MD5STEP(F3, d, a, b, c, in[12] + 0xe6db99e5, 11);
- MD5STEP(F3, c, d, a, b, in[15] + 0x1fa27cf8, 16);
- MD5STEP(F3, b, c, d, a, in[2] + 0xc4ac5665, 23);
-
- MD5STEP(F4, a, b, c, d, in[0] + 0xf4292244, 6);
- MD5STEP(F4, d, a, b, c, in[7] + 0x432aff97, 10);
- MD5STEP(F4, c, d, a, b, in[14] + 0xab9423a7, 15);
- MD5STEP(F4, b, c, d, a, in[5] + 0xfc93a039, 21);
- MD5STEP(F4, a, b, c, d, in[12] + 0x655b59c3, 6);
- MD5STEP(F4, d, a, b, c, in[3] + 0x8f0ccc92, 10);
- MD5STEP(F4, c, d, a, b, in[10] + 0xffeff47d, 15);
- MD5STEP(F4, b, c, d, a, in[1] + 0x85845dd1, 21);
- MD5STEP(F4, a, b, c, d, in[8] + 0x6fa87e4f, 6);
- MD5STEP(F4, d, a, b, c, in[15] + 0xfe2ce6e0, 10);
- MD5STEP(F4, c, d, a, b, in[6] + 0xa3014314, 15);
- MD5STEP(F4, b, c, d, a, in[13] + 0x4e0811a1, 21);
- MD5STEP(F4, a, b, c, d, in[4] + 0xf7537e82, 6);
- MD5STEP(F4, d, a, b, c, in[11] + 0xbd3af235, 10);
- MD5STEP(F4, c, d, a, b, in[2] + 0x2ad7d2bb, 15);
- MD5STEP(F4, b, c, d, a, in[9] + 0xeb86d391, 21);
+ IAX_MD5STEP(IAX_F1, a, b, c, d, in[0] + 0xd76aa478, 7);
+ IAX_MD5STEP(IAX_F1, d, a, b, c, in[1] + 0xe8c7b756, 12);
+ IAX_MD5STEP(IAX_F1, c, d, a, b, in[2] + 0x242070db, 17);
+ IAX_MD5STEP(IAX_F1, b, c, d, a, in[3] + 0xc1bdceee, 22);
+ IAX_MD5STEP(IAX_F1, a, b, c, d, in[4] + 0xf57c0faf, 7);
+ IAX_MD5STEP(IAX_F1, d, a, b, c, in[5] + 0x4787c62a, 12);
+ IAX_MD5STEP(IAX_F1, c, d, a, b, in[6] + 0xa8304613, 17);
+ IAX_MD5STEP(IAX_F1, b, c, d, a, in[7] + 0xfd469501, 22);
+ IAX_MD5STEP(IAX_F1, a, b, c, d, in[8] + 0x698098d8, 7);
+ IAX_MD5STEP(IAX_F1, d, a, b, c, in[9] + 0x8b44f7af, 12);
+ IAX_MD5STEP(IAX_F1, c, d, a, b, in[10] + 0xffff5bb1, 17);
+ IAX_MD5STEP(IAX_F1, b, c, d, a, in[11] + 0x895cd7be, 22);
+ IAX_MD5STEP(IAX_F1, a, b, c, d, in[12] + 0x6b901122, 7);
+ IAX_MD5STEP(IAX_F1, d, a, b, c, in[13] + 0xfd987193, 12);
+ IAX_MD5STEP(IAX_F1, c, d, a, b, in[14] + 0xa679438e, 17);
+ IAX_MD5STEP(IAX_F1, b, c, d, a, in[15] + 0x49b40821, 22);
+
+ IAX_MD5STEP(IAX_F2, a, b, c, d, in[1] + 0xf61e2562, 5);
+ IAX_MD5STEP(IAX_F2, d, a, b, c, in[6] + 0xc040b340, 9);
+ IAX_MD5STEP(IAX_F2, c, d, a, b, in[11] + 0x265e5a51, 14);
+ IAX_MD5STEP(IAX_F2, b, c, d, a, in[0] + 0xe9b6c7aa, 20);
+ IAX_MD5STEP(IAX_F2, a, b, c, d, in[5] + 0xd62f105d, 5);
+ IAX_MD5STEP(IAX_F2, d, a, b, c, in[10] + 0x02441453, 9);
+ IAX_MD5STEP(IAX_F2, c, d, a, b, in[15] + 0xd8a1e681, 14);
+ IAX_MD5STEP(IAX_F2, b, c, d, a, in[4] + 0xe7d3fbc8, 20);
+ IAX_MD5STEP(IAX_F2, a, b, c, d, in[9] + 0x21e1cde6, 5);
+ IAX_MD5STEP(IAX_F2, d, a, b, c, in[14] + 0xc33707d6, 9);
+ IAX_MD5STEP(IAX_F2, c, d, a, b, in[3] + 0xf4d50d87, 14);
+ IAX_MD5STEP(IAX_F2, b, c, d, a, in[8] + 0x455a14ed, 20);
+ IAX_MD5STEP(IAX_F2, a, b, c, d, in[13] + 0xa9e3e905, 5);
+ IAX_MD5STEP(IAX_F2, d, a, b, c, in[2] + 0xfcefa3f8, 9);
+ IAX_MD5STEP(IAX_F2, c, d, a, b, in[7] + 0x676f02d9, 14);
+ IAX_MD5STEP(IAX_F2, b, c, d, a, in[12] + 0x8d2a4c8a, 20);
+
+ IAX_MD5STEP(IAX_F3, a, b, c, d, in[5] + 0xfffa3942, 4);
+ IAX_MD5STEP(IAX_F3, d, a, b, c, in[8] + 0x8771f681, 11);
+ IAX_MD5STEP(IAX_F3, c, d, a, b, in[11] + 0x6d9d6122, 16);
+ IAX_MD5STEP(IAX_F3, b, c, d, a, in[14] + 0xfde5380c, 23);
+ IAX_MD5STEP(IAX_F3, a, b, c, d, in[1] + 0xa4beea44, 4);
+ IAX_MD5STEP(IAX_F3, d, a, b, c, in[4] + 0x4bdecfa9, 11);
+ IAX_MD5STEP(IAX_F3, c, d, a, b, in[7] + 0xf6bb4b60, 16);
+ IAX_MD5STEP(IAX_F3, b, c, d, a, in[10] + 0xbebfbc70, 23);
+ IAX_MD5STEP(IAX_F3, a, b, c, d, in[13] + 0x289b7ec6, 4);
+ IAX_MD5STEP(IAX_F3, d, a, b, c, in[0] + 0xeaa127fa, 11);
+ IAX_MD5STEP(IAX_F3, c, d, a, b, in[3] + 0xd4ef3085, 16);
+ IAX_MD5STEP(IAX_F3, b, c, d, a, in[6] + 0x04881d05, 23);
+ IAX_MD5STEP(IAX_F3, a, b, c, d, in[9] + 0xd9d4d039, 4);
+ IAX_MD5STEP(IAX_F3, d, a, b, c, in[12] + 0xe6db99e5, 11);
+ IAX_MD5STEP(IAX_F3, c, d, a, b, in[15] + 0x1fa27cf8, 16);
+ IAX_MD5STEP(IAX_F3, b, c, d, a, in[2] + 0xc4ac5665, 23);
+
+ IAX_MD5STEP(IAX_F4, a, b, c, d, in[0] + 0xf4292244, 6);
+ IAX_MD5STEP(IAX_F4, d, a, b, c, in[7] + 0x432aff97, 10);
+ IAX_MD5STEP(IAX_F4, c, d, a, b, in[14] + 0xab9423a7, 15);
+ IAX_MD5STEP(IAX_F4, b, c, d, a, in[5] + 0xfc93a039, 21);
+ IAX_MD5STEP(IAX_F4, a, b, c, d, in[12] + 0x655b59c3, 6);
+ IAX_MD5STEP(IAX_F4, d, a, b, c, in[3] + 0x8f0ccc92, 10);
+ IAX_MD5STEP(IAX_F4, c, d, a, b, in[10] + 0xffeff47d, 15);
+ IAX_MD5STEP(IAX_F4, b, c, d, a, in[1] + 0x85845dd1, 21);
+ IAX_MD5STEP(IAX_F4, a, b, c, d, in[8] + 0x6fa87e4f, 6);
+ IAX_MD5STEP(IAX_F4, d, a, b, c, in[15] + 0xfe2ce6e0, 10);
+ IAX_MD5STEP(IAX_F4, c, d, a, b, in[6] + 0xa3014314, 15);
+ IAX_MD5STEP(IAX_F4, b, c, d, a, in[13] + 0x4e0811a1, 21);
+ IAX_MD5STEP(IAX_F4, a, b, c, d, in[4] + 0xf7537e82, 6);
+ IAX_MD5STEP(IAX_F4, d, a, b, c, in[11] + 0xbd3af235, 10);
+ IAX_MD5STEP(IAX_F4, c, d, a, b, in[2] + 0x2ad7d2bb, 15);
+ IAX_MD5STEP(IAX_F4, b, c, d, a, in[9] + 0xeb86d391, 21);
buf[0] += a;
buf[1] += b;
diff --git a/sflphone-common/libs/iax2/md5.h b/sflphone-common/libs/iax2/md5.h
index 81c9e30613b890f34e38663f9cc536dfa7cb4b0a..b3ad37a9b36532268cc9f3e62d909963c70e8e01 100644
--- a/sflphone-common/libs/iax2/md5.h
+++ b/sflphone-common/libs/iax2/md5.h
@@ -8,20 +8,20 @@ typedef unsigned int uint32_t;
typedef unsigned char uint8_t;
#endif
-struct MD5Context {
+struct IAX_MD5Context {
uint32_t buf[4];
uint32_t bits[2];
uint8_t in[64];
};
-void MD5Init(struct MD5Context *context);
-void MD5Update(struct MD5Context *context, uint8_t const *buf, unsigned int len);
-void MD5Final(uint8_t digest[16], struct MD5Context *context);
-void MD5Transform(uint32_t buf[4], uint32_t const in[16]);
+void IAX_MD5Init(struct IAX_MD5Context *context);
+void IAX_MD5Update(struct IAX_MD5Context *context, uint8_t const *buf, unsigned int len);
+void IAX_MD5Final(uint8_t digest[16], struct IAX_MD5Context *context);
+void IAX_MD5Transform(uint32_t buf[4], uint32_t const in[16]);
/*
* This is needed to make RSAREF happy on some MS-DOS compilers.
*/
-typedef struct MD5Context MD5_CTX;
+typedef struct IAX_MD5Context MD5_CTX;
#endif /* !MD5_H */