Digital_Voice_Modem_Project
/
dvmhost
mirror of https://github.com/DVMProject/dvmhost.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

code cleanup and variable clarification;

Browse Source
2.0-maint
Bryan Biedenkapp 3 years ago
parent d68206591c
commit 86316d2f05
3 changed files with 40 additions and 40 deletions
Show Stats Download Patch File Download Diff File

4
p25/P25Defines.h
Unescape View File

@ -118,8 +118,8 @@ namespace p25
const uint8_t P25_MOT_CALLSIGN_LENGTH_BYTES = 8U; const uint8_t P25_MOT_CALLSIGN_LENGTH_BYTES = 8U;
const uint8_t P25_AUTH_RES_LENGTH_BYTES = 4U; const uint8_t P25_AUTH_RES_LENGTH_BYTES = 4U;
const uint8_t P25_AUTH_RS_LENGTH_BYTES = 10U; const uint8_t P25_AUTH_RAND_SEED_LENGTH_BYTES = 10U;
const uint8_t P25_AUTH_RAND_LENGTH_BYTES = 5U; const uint8_t P25_AUTH_RAND_CHLNG_LENGTH_BYTES = 5U;
const uint8_t P25_ALGO_UNENCRYPT = 0x80U; const uint8_t P25_ALGO_UNENCRYPT = 0x80U;

68
p25/lc/TSBK.cpp
Unescape View File

@ -126,9 +126,9 @@ TSBK::~TSBK()
m_authRS = NULL; m_authRS = NULL;
} }
if (m_authRand != NULL) { if (m_authRC != NULL) {
delete[] m_authRand; delete[] m_authRC;
m_authRand = NULL; m_authRC = NULL;
} }
delete[] m_siteCallsign; delete[] m_siteCallsign;
@ -304,11 +304,11 @@ bool TSBK::decodeMBT(const data::DataHeader dataHeader, const data::DataBlock* b
m_netId = (uint32_t)((tsbkValue >> 44) & 0xFFFFFU); // Network ID m_netId = (uint32_t)((tsbkValue >> 44) & 0xFFFFFU); // Network ID
m_sysId = (uint32_t)((tsbkValue >> 32) & 0xFFFU); // System ID m_sysId = (uint32_t)((tsbkValue >> 32) & 0xFFFU); // System ID
m_authStandalone = ((block2[2U] & 0xFFU) & 0x01U) == 0x01U; // Authentication Standalone Flag m_authStandalone = ((block2[2U] & 0xFFU) & 0x01U) == 0x01U; // Authentication Standalone Flag
m_authRand[4U] = (uint8_t)block1[5U] & 0xFFU; // Random Challenge b4 m_authRC[4U] = (uint8_t)block1[5U] & 0xFFU; // Random Challenge b4
m_authRand[3U] = (uint8_t)block1[6U] & 0xFFU; // Random Challenge b3 m_authRC[3U] = (uint8_t)block1[6U] & 0xFFU; // Random Challenge b3
m_authRand[2U] = (uint8_t)block1[7U] & 0xFFU; // Random Challenge b2 m_authRC[2U] = (uint8_t)block1[7U] & 0xFFU; // Random Challenge b2
m_authRand[1U] = (uint8_t)block1[8U] & 0xFFU; // Random Challenge b1 m_authRC[1U] = (uint8_t)block1[8U] & 0xFFU; // Random Challenge b1
m_authRand[0U] = (uint8_t)block1[9U] & 0xFFU; // Random Challenge b0 m_authRC[0U] = (uint8_t)block1[9U] & 0xFFU; // Random Challenge b0
m_authRes[3U] = (uint8_t)block1[10U] & 0xFFU; // Result b3 m_authRes[3U] = (uint8_t)block1[10U] & 0xFFU; // Result b3
m_authRes[2U] = (uint8_t)block1[11U] & 0xFFU; // Result b2 m_authRes[2U] = (uint8_t)block1[11U] & 0xFFU; // Result b2
m_authRes[1U] = (uint8_t)block2[0U] & 0xFFU; // Result b1 m_authRes[1U] = (uint8_t)block2[0U] & 0xFFU; // Result b1
@ -379,11 +379,11 @@ void TSBK::encodeMBT(data::DataHeader& dataHeader, data::DataBlock* blocks)
pduUserData[12U] = m_authRS[2U]; // Random Salt b2 pduUserData[12U] = m_authRS[2U]; // Random Salt b2
pduUserData[13U] = m_authRS[1U]; // Random Salt b1 pduUserData[13U] = m_authRS[1U]; // Random Salt b1
pduUserData[14U] = m_authRS[0U]; // Random Salt b0 pduUserData[14U] = m_authRS[0U]; // Random Salt b0
pduUserData[15U] = m_authRand[4U]; // Random Challenge b4 pduUserData[15U] = m_authRC[4U]; // Random Challenge b4
pduUserData[16U] = m_authRand[3U]; // Random Challenge b3 pduUserData[16U] = m_authRC[3U]; // Random Challenge b3
pduUserData[17U] = m_authRand[2U]; // Random Challenge b2 pduUserData[17U] = m_authRC[2U]; // Random Challenge b2
pduUserData[18U] = m_authRand[1U]; // Random Challenge b1 pduUserData[18U] = m_authRC[1U]; // Random Challenge b1
pduUserData[19U] = m_authRand[0U]; // Random Challenge b0 pduUserData[19U] = m_authRC[0U]; // Random Challenge b0
} }
break; break;
default: default:
@ -1339,7 +1339,7 @@ void TSBK::setAuthRS(const uint8_t* rs)
{ {
assert(rs != NULL); assert(rs != NULL);
::memcpy(m_authRS, rs, P25_AUTH_RS_LENGTH_BYTES); ::memcpy(m_authRS, rs, P25_AUTH_RAND_SEED_LENGTH_BYTES);
} }
/// <summary>Gets the authentication random seed.</summary> /// <summary>Gets the authentication random seed.</summary>
@ -1348,25 +1348,25 @@ void TSBK::getAuthRS(uint8_t* rs) const
{ {
assert(rs != NULL); assert(rs != NULL);
::memcpy(rs, m_authRS, P25_AUTH_RS_LENGTH_BYTES); ::memcpy(rs, m_authRS, P25_AUTH_RAND_SEED_LENGTH_BYTES);
} }
/// <summary>Sets the authentication random challenge.</summary> /// <summary>Sets the authentication random challenge.</summary>
/// <param name="mi"></param> /// <param name="rc"></param>
void TSBK::setAuthRand(const uint8_t* rand) void TSBK::setAuthRC(const uint8_t* rc)
{ {
assert(rand != NULL); assert(rc != NULL);
::memcpy(m_authRand, rand, P25_AUTH_RAND_LENGTH_BYTES); ::memcpy(m_authRC, rc, P25_AUTH_RAND_CHLNG_LENGTH_BYTES);
} }
/// <summary>Gets the authentication random challenge.</summary> /// <summary>Gets the authentication random challenge.</summary>
/// <returns></returns> /// <returns></returns>
void TSBK::getAuthRand(uint8_t* rand) const void TSBK::getAuthRC(uint8_t* rc) const
{ {
assert(rand != NULL); assert(rc != NULL);
::memcpy(rand, m_authRand, P25_AUTH_RAND_LENGTH_BYTES); ::memcpy(rc, m_authRC, P25_AUTH_RAND_CHLNG_LENGTH_BYTES);
} }
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
@ -1445,7 +1445,7 @@ TSBK::TSBK(SiteData siteData) :
m_sndcpDAC(1U), m_sndcpDAC(1U),
m_authRes(NULL), m_authRes(NULL),
m_authRS(NULL), m_authRS(NULL),
m_authRand(NULL), m_authRC(NULL),
m_siteCallsign(NULL) m_siteCallsign(NULL)
{ {
m_siteCallsign = new uint8_t[P25_MOT_CALLSIGN_LENGTH_BYTES]; m_siteCallsign = new uint8_t[P25_MOT_CALLSIGN_LENGTH_BYTES];
@ -1453,11 +1453,11 @@ TSBK::TSBK(SiteData siteData) :
setCallsign(siteData.callsign()); setCallsign(siteData.callsign());
m_authRes = new uint8_t[P25_AUTH_RES_LENGTH_BYTES]; m_authRes = new uint8_t[P25_AUTH_RES_LENGTH_BYTES];
::memset(m_siteCallsign, 0x00U, P25_AUTH_RES_LENGTH_BYTES); ::memset(m_authRes, 0x00U, P25_AUTH_RES_LENGTH_BYTES);
m_authRS = new uint8_t[P25_AUTH_RS_LENGTH_BYTES]; m_authRS = new uint8_t[P25_AUTH_RAND_SEED_LENGTH_BYTES];
::memset(m_siteCallsign, 0x00U, P25_AUTH_RS_LENGTH_BYTES); ::memset(m_authRS, 0x00U, P25_AUTH_RAND_SEED_LENGTH_BYTES);
m_authRand = new uint8_t[P25_AUTH_RAND_LENGTH_BYTES]; m_authRC = new uint8_t[P25_AUTH_RAND_CHLNG_LENGTH_BYTES];
::memset(m_siteCallsign, 0x00U, P25_AUTH_RAND_LENGTH_BYTES); ::memset(m_authRC, 0x00U, P25_AUTH_RAND_CHLNG_LENGTH_BYTES);
} }
/// <summary> /// <summary>
@ -1539,15 +1539,15 @@ void TSBK::copy(const TSBK& data)
delete[] m_authRes; delete[] m_authRes;
} }
m_authRS = new uint8_t[P25_AUTH_RS_LENGTH_BYTES]; m_authRS = new uint8_t[P25_AUTH_RAND_SEED_LENGTH_BYTES];
::memcpy(m_authRS, data.m_authRS, P25_AUTH_RS_LENGTH_BYTES); ::memcpy(m_authRS, data.m_authRS, P25_AUTH_RAND_SEED_LENGTH_BYTES);
if (m_authRand != NULL) { if (m_authRC != NULL) {
delete[] m_authRand; delete[] m_authRC;
} }
m_authRand = new uint8_t[P25_AUTH_RAND_LENGTH_BYTES]; m_authRC = new uint8_t[P25_AUTH_RAND_CHLNG_LENGTH_BYTES];
::memcpy(m_authRand, data.m_authRand, P25_AUTH_RAND_LENGTH_BYTES); ::memcpy(m_authRC, data.m_authRC, P25_AUTH_RAND_CHLNG_LENGTH_BYTES);
delete[] m_siteCallsign; delete[] m_siteCallsign;

8
p25/lc/TSBK.h
Unescape View File

@ -104,12 +104,12 @@ namespace p25
/// <summary>Sets the authentication random seed.</summary> /// <summary>Sets the authentication random seed.</summary>
void setAuthRS(const uint8_t* rs); void setAuthRS(const uint8_t* rs);
/// <summary>Gets the authentication random seed.</summary> /// <summary>Gets the authentication random seed.</summary>
void getAuthRS(uint8_t* mi) const; void getAuthRS(uint8_t* rs) const;
/// <summary>Sets the authentication random challenge.</summary> /// <summary>Sets the authentication random challenge.</summary>
void setAuthRand(const uint8_t* rand); void setAuthRC(const uint8_t* rc);
/// <summary>Gets the authentication random challenge.</summary> /// <summary>Gets the authentication random challenge.</summary>
void getAuthRand(uint8_t* mrandi) const; void getAuthRC(uint8_t* rc) const;
public: public:
/// <summary>Flag indicating verbose log output.</summary> /// <summary>Flag indicating verbose log output.</summary>
@ -256,7 +256,7 @@ namespace p25
/** Authentication data */ /** Authentication data */
uint8_t* m_authRes; uint8_t* m_authRes;
uint8_t* m_authRS; uint8_t* m_authRS;
uint8_t* m_authRand; uint8_t* m_authRC;
/** Local Site data */ /** Local Site data */
uint8_t* m_siteCallsign; uint8_t* m_siteCallsign;

Write Preview
Loading…
Cancel
Save

Powered by TurnKey Linux.