[trafficserver] branch 9.1.x updated (ad8e411 -> bbdf4ec)

[zw...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

zwoop pushed a change to branch 9.1.x
in repository https://gitbox.apache.org/repos/asf/trafficserver.git.


    from ad8e411  Fix QUIC unit test failures (#7497)
     new 85d2500  Disable ja3 plugin when building with boringssl (#7500)
     new bbdf4ec  Fix out of bounds access error in jtest (#7526)

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 configure.ac         | 2 +-
 tools/jtest/jtest.cc | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

[trafficserver] 01/02: Disable ja3 plugin when building with boringssl (#7500)

[zw...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

zwoop pushed a commit to branch 9.1.x
in repository https://gitbox.apache.org/repos/asf/trafficserver.git

commit 85d250097ca121481bef4e732f1c1fc279b32abb
Author: Randall Meyer <rr...@apache.org>
AuthorDate: Tue Feb 9 08:19:08 2021 -0800

    Disable ja3 plugin when building with boringssl (#7500)
    
    SSL_client_hello_get0_legacy_version is not available under boringssl
    
    (cherry picked from commit 92a20b770510a1fb226f798870cc341449eabafe)
---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index b5bf0c2..9481e37 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1363,7 +1363,7 @@ AC_EGREP_CPP(yes, [
   #endif
   ], [
     AC_MSG_RESULT(yes)
-    AS_IF([test "x${enable_experimental_plugins}" = "xyes"], [
+    AS_IF([test "x${enable_experimental_plugins}" = "xyes" && -z "$openssl_is_boringssl"], [
       enable_ja3_plugin=yes
     ])
   ], [AC_MSG_RESULT(no)])

[trafficserver] 02/02: Fix out of bounds access error in jtest (#7526)

[zw...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

zwoop pushed a commit to branch 9.1.x
in repository https://gitbox.apache.org/repos/asf/trafficserver.git

commit bbdf4eca482e74db1eb000b2abffdb246887ae27
Author: Masakazu Kitajo <ma...@apache.org>
AuthorDate: Wed Feb 17 05:52:48 2021 +0900

    Fix out of bounds access error in jtest (#7526)
    
    (cherry picked from commit 7a7a89960ce71be9fce3b0bcf5eb4f7c169903ca)
---
 tools/jtest/jtest.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/jtest/jtest.cc b/tools/jtest/jtest.cc
index 3f04a50..d251520 100644
--- a/tools/jtest/jtest.cc
+++ b/tools/jtest/jtest.cc
@@ -4800,7 +4800,7 @@ ink_web_escapify_string(char *dest_in, char *src_in, int max_dest_len)
   int quit   = 0;
 
   while ((*src != 0) && (dcount < max_dest_len) && (quit == 0)) {
-    if ((char *)memchr(dontescapify, *src, INT_MAX) || ParseRules::is_alpha(*src) || ParseRules::is_digit(*src)) {
+    if ((char *)strchr(dontescapify, *src) || ParseRules::is_alpha(*src) || ParseRules::is_digit(*src)) {
       /* this is regular character, don't escapify it */
       if (dcount + 1 < max_dest_len) {
         *dest++ = *src;