sysmocom
/
asterisk
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

security-events: Fix SuccessfulAuth using_password declaration. 

The SuccessfulAuth using_password field was declared as a pointer to a
uint32_t when the field was later read as a uint32_t value.  This resulted
in unnecessary casts and a non-portable field value reinterpret in
main/security_events.c:add_json_object().  i.e., It would work on a 32 bit
architecture but not on a 64 bit big endian architecture.

Change-Id: Ia08bc797613a62f07e5473425f9ccd8d77c80935
This commit is contained in:
Richard Mudgett 2017-12-01 13:54:26 -06:00
parent 890ffcd672
commit 8536a09b86
4 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
channels/sip/include/security_events.h
View File

@ -32,7 +32,7 @@
void sip_report_invalid_peer(const struct sip_pvt *p);
void sip_report_failed_acl(const struct sip_pvt *p, const char *aclname);
void sip_report_inval_password(const struct sip_pvt *p, const char *responsechallenge, const char *responsehash);
void sip_report_auth_success(const struct sip_pvt *p, uint32_t *using_password);
void sip_report_auth_success(const struct sip_pvt *p, uint32_t using_password);
void sip_report_session_limit(const struct sip_pvt *p);
void sip_report_failed_challenge_response(const struct sip_pvt *p, const char *response, const char *expected_response);
void sip_report_chal_sent(const struct sip_pvt *p);

9
channels/sip/security_events.c
View File

@ -120,7 +120,7 @@ void sip_report_inval_password(const struct sip_pvt *p, const char *response_cha
ast_security_event_report(AST_SEC_EVT(&inval_password));
}
void sip_report_auth_success(const struct sip_pvt *p, uint32_t *using_password)
void sip_report_auth_success(const struct sip_pvt *p, uint32_t using_password)
{
char session_id[32];
@ -269,7 +269,8 @@ void sip_report_inval_transport(const struct sip_pvt *p, const char *transport)
}
int sip_report_security_event(const char *peer, struct ast_sockaddr *addr, const struct sip_pvt *p,
const struct sip_request *req, const int res) {
const struct sip_request *req, const int res)
{
struct sip_peer *peer_report;
enum check_auth_result res_report = res;
@ -295,9 +296,9 @@ int sip_report_security_event(const char *peer, struct ast_sockaddr *addr, const
case AUTH_SUCCESSFUL:
if (peer_report) {
if (ast_strlen_zero(peer_report->secret) && ast_strlen_zero(peer_report->md5secret)) {
sip_report_auth_success(p, (uint32_t *) 0);
sip_report_auth_success(p, 0);
} else {
sip_report_auth_success(p, (uint32_t *) 1);
sip_report_auth_success(p, 1);
}
}
break;

2
include/asterisk/security_events_defs.h
View File

@ -394,7 +394,7 @@ struct ast_security_event_successful_auth {
* \brief Using password - if a password was used or not
* \note required, 0 = no, 1 = yes
*/
uint32_t *using_password;
uint32_t using_password;
};
/*!

2
res/res_pjsip/security_events.c
View File

@ -186,7 +186,7 @@ void ast_sip_report_auth_success(struct ast_sip_endpoint *endpoint, pjsip_rx_dat
.transport = transport,
},
.common.session_id = call_id,
.using_password = auth ? (uint32_t *)1 : (uint32_t *)0,
.using_password = auth ? 1 : 0,
};
security_event_populate(rdata, call_id, sizeof(call_id), &local, &remote);