From fe4cd68444e58bb61bf0678030d896f3bfb53164 Mon Sep 17 00:00:00 2001 From: Kinsey Moore Date: Thu, 3 Oct 2013 19:30:33 +0000 Subject: [PATCH] Fix security events for AMI invalid password In r337595, additional security events were added for chan_sip authentication failures. The new IEs added to the existing invalid password event were defined as required IEs, but existing users of the event did not set the new IEs and could not since they didn't apply to existing uses. They are now marked as optional IEs. (closes issue ASTERISK-22578) Reported by: Matt Jordan ........ Merged revisions 400421 from http://svn.asterisk.org/svn/asterisk/branches/11 ........ Merged revisions 400440 from http://svn.asterisk.org/svn/asterisk/branches/12 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@400441 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- main/security_events.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/main/security_events.c b/main/security_events.c index d115472917..d10338984a 100644 --- a/main/security_events.c +++ b/main/security_events.c @@ -380,14 +380,14 @@ static const struct { { AST_EVENT_IE_SESSION_ID, SEC_EVT_FIELD(common, session_id) }, { AST_EVENT_IE_LOCAL_ADDR, SEC_EVT_FIELD(common, local_addr) }, { AST_EVENT_IE_REMOTE_ADDR, SEC_EVT_FIELD(common, remote_addr) }, - { AST_EVENT_IE_CHALLENGE, SEC_EVT_FIELD(inval_password, challenge) }, - { AST_EVENT_IE_RECEIVED_CHALLENGE, SEC_EVT_FIELD(inval_password, received_challenge) }, - { AST_EVENT_IE_RECEIVED_HASH, SEC_EVT_FIELD(inval_password, received_hash) }, { AST_EVENT_IE_END, 0 } }, .optional_ies = { { AST_EVENT_IE_MODULE, SEC_EVT_FIELD(common, module) }, { AST_EVENT_IE_SESSION_TV, SEC_EVT_FIELD(common, session_tv) }, + { AST_EVENT_IE_CHALLENGE, SEC_EVT_FIELD(inval_password, challenge) }, + { AST_EVENT_IE_RECEIVED_CHALLENGE, SEC_EVT_FIELD(inval_password, received_challenge) }, + { AST_EVENT_IE_RECEIVED_HASH, SEC_EVT_FIELD(inval_password, received_hash) }, { AST_EVENT_IE_END, 0 } }, },