<p>Benjamin Keith Ford has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.asterisk.org/c/asterisk/+/14694">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">testing only<br><br>Change-Id: I74992fdb1fed8bc83969f6dfafc13f1d0734f290<br>---<br>M res/res_pjsip_stir_shaken.c<br>M res/res_stir_shaken.c<br>M res/res_stir_shaken/curl.c<br>3 files changed, 10 insertions(+), 1 deletion(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.asterisk.org:29418/asterisk refs/changes/94/14694/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/res/res_pjsip_stir_shaken.c b/res/res_pjsip_stir_shaken.c</span><br><span>index 60dfdc4..322ba7e 100644</span><br><span>--- a/res/res_pjsip_stir_shaken.c</span><br><span>+++ b/res/res_pjsip_stir_shaken.c</span><br><span>@@ -149,6 +149,7 @@</span><br><span>    encoded_val = strtok_r(identity_hdr_val, ".", &identity_hdr_val);</span><br><span>      header = ast_base64decode_string(encoded_val);</span><br><span>       if (ast_strlen_zero(header)) {</span><br><span style="color: hsl(120, 100%, 40%);">+                ast_log(LOG_NOTICE, "ssdebug: no 'header'\n");</span><br><span>             ast_stir_shaken_add_verification(chan, caller_id, "", AST_STIR_SHAKEN_VERIFY_SIGNATURE_FAILED);</span><br><span>            return 0;</span><br><span>    }</span><br><span>@@ -156,6 +157,7 @@</span><br><span>      encoded_val = strtok_r(identity_hdr_val, ".", &identity_hdr_val);</span><br><span>      payload = ast_base64decode_string(encoded_val);</span><br><span>      if (ast_strlen_zero(payload)) {</span><br><span style="color: hsl(120, 100%, 40%);">+               ast_log(LOG_NOTICE, "ssdebug: no 'payload'\n");</span><br><span>            ast_stir_shaken_add_verification(chan, caller_id, "", AST_STIR_SHAKEN_VERIFY_SIGNATURE_FAILED);</span><br><span>            return 0;</span><br><span>    }</span><br><span>@@ -163,6 +165,7 @@</span><br><span>      /* It's fine to leave the signature encoded */</span><br><span>   signature = strtok_r(identity_hdr_val, ";", &identity_hdr_val);</span><br><span>        if (ast_strlen_zero(signature)) {</span><br><span style="color: hsl(120, 100%, 40%);">+             ast_log(LOG_NOTICE, "ssdebug: no 'signatutre'\n");</span><br><span>                 ast_stir_shaken_add_verification(chan, caller_id, "", AST_STIR_SHAKEN_VERIFY_SIGNATURE_FAILED);</span><br><span>            return 0;</span><br><span>    }</span><br><span>@@ -177,6 +180,7 @@</span><br><span> </span><br><span>  algorithm = strtok_r(identity_hdr_val, ";", &identity_hdr_val);</span><br><span>        if (ast_strlen_zero(algorithm)) {</span><br><span style="color: hsl(120, 100%, 40%);">+             ast_log(LOG_NOTICE, "ssdebug: no 'algorithm'\n");</span><br><span>          ast_stir_shaken_add_verification(chan, caller_id, "", AST_STIR_SHAKEN_VERIFY_SIGNATURE_FAILED);</span><br><span>            return 0;</span><br><span>    }</span><br><span>@@ -185,6 +189,7 @@</span><br><span> </span><br><span>  ss_payload = ast_stir_shaken_verify(header, payload, signature, algorithm, public_key_url);</span><br><span>  if (!ss_payload) {</span><br><span style="color: hsl(120, 100%, 40%);">+            ast_log(LOG_NOTICE, "ssdebug: verify failed\n");</span><br><span>           ast_stir_shaken_add_verification(chan, caller_id, attestation, AST_STIR_SHAKEN_VERIFY_SIGNATURE_FAILED);</span><br><span>             return 0;</span><br><span>    }</span><br><span>diff --git a/res/res_stir_shaken.c b/res/res_stir_shaken.c</span><br><span>index 7a141f7..c08f833 100644</span><br><span>--- a/res/res_stir_shaken.c</span><br><span>+++ b/res/res_stir_shaken.c</span><br><span>@@ -676,11 +676,13 @@</span><br><span>           /* Set up the default path */</span><br><span>                filename = basename(public_key_url);</span><br><span>                 if (ast_asprintf(&file_path, "%s/keys/%s/%s", ast_config_AST_DATA_DIR, STIR_SHAKEN_DIR_NAME, filename) < 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+                        ast_log(LOG_NOTICE, "ssdebug: 1\n");</span><br><span>                       return NULL;</span><br><span>                 }</span><br><span> </span><br><span>                /* Download to the default path */</span><br><span>           if (run_curl(public_key_url, file_path)) {</span><br><span style="color: hsl(120, 100%, 40%);">+                    ast_log(LOG_NOTICE, "ssdebug: 2\n");</span><br><span>                       return NULL;</span><br><span>                 }</span><br><span> </span><br><span>@@ -702,6 +704,7 @@</span><br><span> </span><br><span>              /* If this fails, then there's nothing we can do */</span><br><span>              if (curl_and_check_expiration(public_key_url, file_path, &curl)) {</span><br><span style="color: hsl(120, 100%, 40%);">+                        ast_log(LOG_NOTICE, "ssdebug: 3\n");</span><br><span>                       return NULL;</span><br><span>                 }</span><br><span>    }</span><br><span>@@ -716,6 +719,7 @@</span><br><span>              remove_public_key_from_astdb(public_key_url);</span><br><span> </span><br><span>            if (curl_and_check_expiration(public_key_url, file_path, &curl)) {</span><br><span style="color: hsl(120, 100%, 40%);">+                        ast_log(LOG_NOTICE, "ssdebug: 4\n");</span><br><span>                       return NULL;</span><br><span>                 }</span><br><span> </span><br><span>diff --git a/res/res_stir_shaken/curl.c b/res/res_stir_shaken/curl.c</span><br><span>index 634c2bf..ab29e3d 100644</span><br><span>--- a/res/res_stir_shaken/curl.c</span><br><span>+++ b/res/res_stir_shaken/curl.c</span><br><span>@@ -41,7 +41,7 @@</span><br><span> {</span><br><span>  struct curl_cb_data *data;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-  data = ast_calloc(1, sizeof(data));</span><br><span style="color: hsl(120, 100%, 40%);">+   data = ast_calloc(1, sizeof(*data));</span><br><span> </span><br><span>     return data;</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/c/asterisk/+/14694">change 14694</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.asterisk.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.asterisk.org/c/asterisk/+/14694"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I74992fdb1fed8bc83969f6dfafc13f1d0734f290 </div>
<div style="display:none"> Gerrit-Change-Number: 14694 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Benjamin Keith Ford <bford@digium.com> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>