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

diff --git a/channels/sip/include/security_events.h b/channels/sip/include/security_events.h
index 1d0f58b4102fd8e2c1f0306dc3ec570e1ebe8344..9f4bb2ec9b2d8b96e6d131326aa2f950452dd768 100644 (file)
--- a/channels/sip/include/security_events.h
+++ b/channels/sip/include/security_events.h
@@ -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);

diff --git a/channels/sip/security_events.c b/channels/sip/security_events.c
index 9f5d94f97c0d2b1423a2d4dd29576a3b26b63975..5b6755120452232e749794ce3aba2f2c39b7b860 100644 (file)
--- a/channels/sip/security_events.c
+++ b/channels/sip/security_events.c
@@ -122,7 +122,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];
 
@@ -271,7 +271,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;
@@ -297,9 +298,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;

diff --git a/include/asterisk/security_events_defs.h b/include/asterisk/security_events_defs.h
index 30a7136064f29681fafcb77e4936d89e86bb5c8f..1cae046f9be76bfb6bdf11431acc80b56f14a406 100644 (file)
--- a/include/asterisk/security_events_defs.h
+++ b/include/asterisk/security_events_defs.h
@@ -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;
 };
 
 /*!

diff --git a/res/res_pjsip/security_events.c b/res/res_pjsip/security_events.c
index ef3a748b2fd5424976ec21f116d18bd3c05542d4..f5a0bcaf53fad3c5f4115c9383f22c1e26b52f2f 100644 (file)
--- a/res/res_pjsip/security_events.c
+++ b/res/res_pjsip/security_events.c
@@ -188,7 +188,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);