Merge branch 'master' of [email protected]:wireshark/wireshark.git into …

…s7commwireshark * 'master' of [email protected]:wireshark/wireshark.git: (606 commits) rc-v3: Deduplicate fields pkix1explicit: Deduplicate some incompatible field names file-rtpdump: Fix duplicated field name. IRC: Use proto_irc isf hf_irc_ctcp(Duplicated fields) rtp-ed137: Fix duplicated fields warning. Revert "poc-settings-dtd:poc-settings' exists multiple times with incompatible types" wustil: Add David Gay's dtoa for shortest sufficient double representation Optimize hash table usage in dissectors GNSS: dissect Galileo SAR Short-RLM TCP: Add an analysis field for Karn-Partridge ambiguous ACKs docs: Update the Stratoshark quick start IEEE1722: Don't reuse can.reserved in ACF CAN packet-communityid: Fix duplicated field name. poc-settings-dtd:poc-settings' exists multiple times with incompatible types MQ: conflicting entry in value_string (MQCA_APPL_ID) and (MQCA_FIRST) ORAN FH CUS: Show meaning of symbolMask for ASM command packet-delep: Fix duplicated filter ids. packet-asam-cmp: Fix duplicated field name. show_exception: Remove duplicated field warning. HICP: Allow filtering the error string ... # Conflicts: # .github/workflows/macos.yml # .github/workflows/ubuntu.yml Signed-off-by: Juergen Kosel <[email protected]>
JuergenKosel · Dec 17, 2024 · 87f5a1b · 87f5a1b
2 parents ada5673 + 489abfd
commit 87f5a1b
Show file tree

Hide file tree

Showing 1,081 changed files with 77,374 additions and 22,343 deletions.
diff --git a/.github/workflows/macos-logray.yml → .github/workflows/macos-stratoshark.yml b/.github/workflows/macos-logray.yml → .github/workflows/macos-stratoshark.yml
@@ -9,6 +9,8 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
+        with:
+          persist-credentials: false
       - name: Set up Python 3.11
         uses: actions/setup-python@v5
         with:

diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -9,6 +9,8 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
+        with:
+          persist-credentials: false
       - name: get-submodule
         run: git submodule update --init
       - name: Set up Python 3.11

diff --git a/.github/workflows/msys2.yml b/.github/workflows/msys2.yml
@@ -17,12 +17,14 @@ jobs:
           install: base-devel
       - name: Checkout
         uses: actions/checkout@v4
+        with:
+          persist-credentials: false
       - name: Install dependencies
         run: tools/msys2-setup.sh --install-all --noconfirm
       - name: Build
         run: |
           mkdir build && cd build
-          cmake -G Ninja -DFETCH_lua=Yes ..
+          cmake -G Ninja ..
           ninja
           ninja test
           ninja wireshark_nsis_prep
@@ -45,9 +47,32 @@ jobs:
       - name: Run installer
         working-directory: downloads
         run: |
-          Get-ChildItem -Path wireshark-*-x64.exe | ForEach-Object {
-            Start-Process $_.FullName -ArgumentList '/S /D=C:\Wireshark' -Wait
+          $ErrorActionPreference = 'Stop'
+          $installer = Get-ChildItem -Path . -Filter "wireshark-*-x64.exe" -File | Select-Object -First 1
+          if ($null -eq $installer) {
+            Write-Error "Installer not found in downloads directory."
+            exit 1
+          }
+          Start-Process -FilePath $installer.FullName -ArgumentList '/S', '/D=C:\Wireshark' -Wait -NoNewWindow
+          if (!$?) {
+            Write-Error "Wireshark installation failed."
+            exit 1
           }
+        shell: pwsh
       - name: Show version
-        run: C:\Wireshark\wireshark.exe --version
+        run: |
+          $ErrorActionPreference = 'Stop'
+          if (Test-Path "C:\Wireshark\tshark.exe") {
+            $versionOutput = & "C:\Wireshark\tshark.exe" --version
+            if ($LASTEXITCODE -ne 0) {
+              Write-Error "Failed to retrieve TShark version."
+              exit $LASTEXITCODE
+            }
+            Write-Output $versionOutput
+          } else {
+            Write-Error "TShark executable not found at C:\Wireshark\tshark.exe."
+            exit 1
+          }
+        shell: pwsh
+
 
diff --git a/.github/workflows/options.yml b/.github/workflows/options.yml
@@ -12,6 +12,8 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
+        with:
+          persist-credentials: false
       - name: Install deps
         run: |
           sudo tools/debian-setup.sh --install-all ninja-build -y

diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
@@ -9,6 +9,8 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
+        with:
+          persist-credentials: false
       - name: get-submodule
         run: git submodule update --init
       - name: Install deps

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -14,6 +14,8 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
+        with:
+          persist-credentials: false
       - name: Choco install
         run: choco install -y --force --no-progress asciidoctorj xsltproc docbook-bundle nsis winflexbison3 cmake
       - name: Install strawberryperl

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -186,7 +186,7 @@ workflow:
     - $env:WIRESHARK_BASE_DIR = "C:\Development"
     - $env:Configuration = "RelWithDebInfo"
     - $env:Path += ";C:\Program Files\CMake\bin"
-    - $env:CMAKE_PREFIX_PATH = "C:\qt\6.5.3\msvc2019_64"
+    - $env:CMAKE_PREFIX_PATH = "C:\qt\6.8.0\msvc2022_64"
     # https://help.appveyor.com/discussions/questions/18777-how-to-use-vcvars64bat-from-powershell
     - cmd.exe /c "call `"C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvars64.bat`" && set " | Foreach-Object { if ($_ -match "^(.*?)=(.*)$") { Set-Content "env:\$($matches[1])" $matches[2] } }
     # Testing / debugging only.
@@ -296,6 +296,8 @@ Source Package:
     - WIRESHARK_VERSION=$(< wireshark_version.txt)
     - cp -v doc/release-notes.html ../release-notes-${WIRESHARK_VERSION}.html
     - cp -v doc/release-notes.txt ../release-notes-${WIRESHARK_VERSION}.txt
+    - cd ..
+    - zstdcat --threads=0 wireshark-${WIRESHARK_VERSION}.tar.zst | xz --threads=0 > wireshark-${WIRESHARK_VERSION}.tar.xz
   after_script:
     # - ccache --max-size $( du --summarize --block-size=1M "$CI_PROJECT_DIR/build" | awk '{printf ("%dM", $1 * 1.5)}' )
     - if [ "$CI_JOB_STATUS" != "success" ]; then exit 0 ; fi
@@ -435,6 +437,56 @@ Ubuntu APT Test:
     GIT_STRATEGY: none
   needs: [ 'Ubuntu APT Package' ]
 
+Arch Linux :
+  extends: .build-linux
+  rules: !reference [.if-2x-daily-schedule]
+  image: registry.gitlab.com/wireshark/wireshark-containers/arch-dev
+  script:
+    - COMMON_PACMAN_ARGS="--sync --refresh --sysupgrade --needed --noconfirm"
+    - ./tools/make-version.py --set-release --version-file=wireshark_version.txt .
+    - WIRESHARK_VERSION=$(cat wireshark_version.txt)
+    - WIRESHARK_PREFIX="/opt/wireshark-$WIRESHARK_VERSION"
+    # There are no falcosecurity/libs or falcosecurity/plugins packages for Arch,
+    # so just build them ourselves for now.
+    - pushd /tmp
+    # falcosecurity/plugins
+    - pacman $COMMON_PACMAN_ARGS go
+    - git clone https://github.com/falcosecurity/plugins.git falco-plugins
+    - pushd /tmp/falco-plugins/plugins/cloudtrail
+    - make
+    - popd
+    - pushd /tmp/falco-plugins/plugins/gcpaudit
+    - make
+    - popd
+    # falcosecurity/libs
+    - pacman $COMMON_PACMAN_ARGS uthash libelf onetbb jsoncpp re2
+    - export LDFLAGS=-Wl,-rpath,'$ORIGIN/../lib'
+    - git clone https://github.com/falcosecurity/libs.git falco-libs
+    - cd /tmp/falco-libs
+    - git switch -c 0.18.1 0.18.1
+    - printf "\e[0Ksection_start:%s:fslibs_cmake_section[collapsed=true]\r\e[0KRunning CMake" "$( date +%s)"
+    - cmake -B build -G Ninja -DBUILD_SHARED_LIBS=on -DMINIMAL_BUILD=on -DBUILD_DRIVER=off -DENABLE_ENGINE_KMOD=off -DBUILD_LIBSCAP_EXAMPLES=off -DUSE_BUNDLED_DEPS=off -DUSE_BUNDLED_VALIJSON=on -DCREATE_TEST_TARGETS=off -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_RPATH='$ORIGIN/../lib' -DCMAKE_INSTALL_PREFIX=$WIRESHARK_PREFIX
+    - printf "\e[0Ksection_end:%s:fslibs_cmake_section\r\e[0K" "$( date +%s)"
+    - ninja -C build
+    - ninja -C build install
+    - sed -i -e 's/-linstall_lib_link_libraries-NOTFOUND/-lscap_platform -lscap_platform_util/g' $WIRESHARK_PREFIX/lib/pkgconfig/libscap.pc
+    - popd
+    - export CMAKE_PREFIX_PATH=$WIRESHARK_PREFIX
+    - mkdir build
+    - cd build
+    - printf "\e[0Ksection_start:%s:cmake_section[collapsed=true]\r\e[0KRunning CMake" "$( date +%s)"
+    - cmake -G Ninja -DBUILD_stratoshark=on -DBUILD_sshdig=on -DBUILD_falcodump=on -DFALCO_PLUGINS="/tmp/falco-plugins/plugins/cloudtrail/libcloudtrail.so;/tmp/falco-plugins/plugins/gcpaudit/libgcpaudit.so" -DCMAKE_INSTALL_PREFIX=$WIRESHARK_PREFIX ..
+    - printf "\e[0Ksection_end:%s:cmake_section\r\e[0K" "$( date +%s)"
+    - ninja
+    - ninja install
+    - install -v -D -m 755 -t $WIRESHARK_PREFIX/lib/stratoshark/plugins/4.5/epan run/plugins/4.5/epan/falco-bridge.so
+    - install -v -D -m 755 -t $WIRESHARK_PREFIX/lib/stratoshark/plugins/falco run/plugins/falco/*.so
+    # XXX Need to add an install prereqs script
+    - tar -C / -cJf $CI_PROJECT_DIR/wireshark-arch-$WIRESHARK_VERSION.tar.xz opt/wireshark-$WIRESHARK_VERSION
+  artifacts:
+    paths:
+      - $CI_PROJECT_DIR/wireshark-arch-*.tar.xz
+
 Windows x64 Package:
   extends: .build-windows
   rules: !reference [.if-w-w-only-merged]
@@ -443,14 +495,14 @@ Windows x64 Package:
   before_script:
     - $env:WIRESHARK_BASE_DIR = "C:\Development"
     - $env:Configuration = "RelWithDebInfo"
-    - $env:CMAKE_PREFIX_PATH = "C:\Qt\6.5.3\msvc2019_64"
+    - $env:CMAKE_PREFIX_PATH = "C:\Qt\6.8.0\msvc2022_64"
     # https://help.appveyor.com/discussions/questions/18777-how-to-use-vcvars64bat-from-powershell
     - cmd.exe /c "call `"C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvars64.bat`" && set" | Foreach-Object { if ($_ -match "^(.*?)=(.*)$") { Set-Content "env:\$($matches[1])" $matches[2] } }
     - mkdir build
     - cd build
   script:
     - C:\Windows\py.exe ..\tools\make-version.py --set-release --version-file=wireshark_version.txt ..
-    - cmake -G "Visual Studio 17 2022" -A x64 -DENABLE_LTO=off -DBUILD_stratoshark=on -DBUILD_falcodump=on -DENABLE_SIGNED_NSIS=on ..
+    - cmake -G "Visual Studio 17 2022" -A x64 -DENABLE_LTO=off -DBUILD_stratoshark=on -DBUILD_sshdig=on -DBUILD_falcodump=on -DENABLE_SIGNED_NSIS=on ..
     - msbuild /verbosity:minimal "/consoleloggerparameters:PerformanceSummary;NoSummary" /maxcpucount Wireshark.sln
     - msbuild /verbosity:minimal /maxcpucount test-programs.vcxproj
     - msbuild /verbosity:minimal /maxcpucount wireshark_nsis_prep.vcxproj
@@ -488,14 +540,14 @@ Windows Arm64 Package:
   before_script:
     - $env:WIRESHARK_BASE_DIR = "C:\Development"
     - $env:Configuration = "RelWithDebInfo"
-    - $env:CMAKE_PREFIX_PATH = "C:\Qt\6.5.3\msvc2019_arm64"
+    - $env:CMAKE_PREFIX_PATH = "C:\Qt\6.8.0\msvc2022_arm64"
     # https://help.appveyor.com/discussions/questions/18777-how-to-use-vcvars64bat-from-powershell
     - cmd.exe /c "call `"C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvarsarm64.bat`" && set" | Foreach-Object { if ($_ -match "^(.*?)=(.*)$") { Set-Content "env:\$($matches[1])" $matches[2] } }
     - mkdir build
     - cd build
   script:
     - C:\Windows\py.exe ..\tools\make-version.py --set-release --version-file=wireshark_version.txt ..
-    - cmake -G "Visual Studio 17 2022" -A arm64 -DENABLE_LTO=off -DBUILD_stratoshark=on -DBUILD_falcodump=on -DENABLE_SIGNED_NSIS=on ..
+    - cmake -G "Visual Studio 17 2022" -A arm64 -DENABLE_LTO=off -DBUILD_stratoshark=on -DBUILD_sshdig=on -DBUILD_falcodump=on -DENABLE_SIGNED_NSIS=on ..
     - msbuild /verbosity:minimal "/consoleloggerparameters:PerformanceSummary;NoSummary" /maxcpucount Wireshark.sln
     - msbuild /verbosity:minimal /maxcpucount test-programs.vcxproj
     - msbuild /verbosity:minimal /maxcpucount wireshark_nsis_prep.vcxproj
@@ -543,12 +595,14 @@ macOS Arm Package:
   retry: 1
   script:
     - export CMAKE_PREFIX_PATH=/usr/local/Qt-6.5.3
+    # Not needed for Falco libs 0.19?
+    - export CXXFLAGS="-isystem /usr/local/include/falcosecurity"
     - export PATH="$PATH:$HOME/bin"
     - mkdir build
     - cd build
     - ../tools/make-version.py --set-release --version-file=wireshark_version.txt ..
     - printf "\e[0Ksection_start:%s:cmake_section[collapsed=true]\r\e[0KRunning CMake" "$( date +%s)"
-    - cmake -DENABLE_CCACHE=ON -DCMAKE_APPLE_SILICON_PROCESSOR=arm64 -DCMAKE_OSX_DEPLOYMENT_TARGET=11.0 -DCMAKE_OSX_ARCHITECTURES=arm64 -DBUILD_stratoshark=on -DBUILD_falcodump=on -DFALCO_PLUGINS=/usr/local/lib/falco-plugins/libcloudtrail.so -DTEST_EXTRA_ARGS=--enable-release -G Ninja ..
+    - cmake -DENABLE_CCACHE=ON -DCMAKE_APPLE_SILICON_PROCESSOR=arm64 -DCMAKE_OSX_DEPLOYMENT_TARGET=11.0 -DCMAKE_OSX_ARCHITECTURES=arm64 -DBUILD_stratoshark=on -DBUILD_sshdig=on -DBUILD_falcodump=on -DFALCO_PLUGINS=/usr/local/lib/falco-plugins/libcloudtrail.so -DTEST_EXTRA_ARGS=--enable-release -G Ninja ..
     - printf "\e[0Ksection_end:%s:cmake_section\r\e[0K" "$( date +%s)"
     - ninja
     - codesign-prep
@@ -593,12 +647,14 @@ macOS Intel Package:
   retry: 1
   script:
     - export CMAKE_PREFIX_PATH=/usr/local/Qt-6.5.3
+    # Not needed for Falco libs 0.19?
+    - export CXXFLAGS="-isystem /usr/local/include/falcosecurity"
     - export PATH="$PATH:$HOME/bin"
     - mkdir build
     - cd build
     - ../tools/make-version.py --set-release --version-file=wireshark_version.txt ..
     - printf "\e[0Ksection_start:%s:cmake_section[collapsed=true]\r\e[0KRunning CMake" "$( date +%s)"
-    - cmake -DENABLE_CCACHE=ON -DCMAKE_OSX_DEPLOYMENT_TARGET=11.0 -DBUILD_stratoshark=on -DBUILD_falcodump=on -DFALCO_PLUGINS=/usr/local/lib/falco-plugins/libcloudtrail.so -DTEST_EXTRA_ARGS=--enable-release -G Ninja ..
+    - cmake -DENABLE_CCACHE=ON -DCMAKE_OSX_DEPLOYMENT_TARGET=11.0 -DBUILD_stratoshark=on -DBUILD_sshdig=on -DBUILD_falcodump=on -DFALCO_PLUGINS=/usr/local/lib/falco-plugins/libcloudtrail.so -DTEST_EXTRA_ARGS=--enable-release -G Ninja ..
     - printf "\e[0Ksection_end:%s:cmake_section\r\e[0K" "$( date +%s)"
     - ninja
     - codesign-prep
@@ -682,8 +738,6 @@ Documentation:
 Commit Check:
   extends: .build-ubuntu
   rules: !reference [.if-merge-request]
-  variables:
-    GITLAB_REPO: "$CI_MERGE_REQUEST_PROJECT_URL"
   script:
     # build-ubuntu puts us in `build`.
     - cd ..
@@ -703,82 +757,16 @@ Commit Check:
     #   https://docs.gitlab.com/ee/ci/testing/unit_test_reports.html
     #   https://www.ibm.com/docs/en/developer-for-zos/14.2?topic=formats-junit-xml-format
     #
-    # Let's generate a unit test report, even if that means wondering which life choices
-    # led us to assemlbing an XML document from fragments in a shell script which is
-    # embedded in YAML.
-    - FAILURE_COUNT=0
-    - TESTCASES="<testcase class='commit_checks.num_commits' name='num_commits' time='1.0'"
-    - |
-      if [[ $NUM_COMMITS -gt 1 ]] ; then
-        TESTCASES+="><failure>ℹ️ This merge request has more than one commit. Please squash any trivial ones:
-
-        $(git log --oneline --no-decorate "${CI_COMMIT_SHA}~$NUM_COMMITS..${CI_COMMIT_SHA}")
-        </failure></testcase>"
-        FAILURE_COUNT=$(( FAILURE_COUNT + 1 ))
-      else
-        TESTCASES+="/>"
-      fi
-    - PC_EXIT_CODE=0
-    - ANALYSIS_MESSAGE=$( ./tools/pre-commit "${CI_COMMIT_SHA}~$NUM_COMMITS" ) || PC_EXIT_CODE=1
-    - TESTCASES+="<testcase class='commit_checks.pre_commit' name='tools/pre-commit' time='1.0'"
-    - |
-      if [ -n "$ANALYSIS_MESSAGE" ] ; then
-        TESTCASES+="><failure>Pre-commit check results:
-
-        $ANALYSIS_MESSAGE
-        </failure></testcase>"
-        FAILURE_COUNT=$(( FAILURE_COUNT + 1 ))
-      else
-        TESTCASES+="/>"
-      fi
-    - VC_EXIT_CODE=0
-    - ANALYSIS_MESSAGE=$( tools/validate-commit.py ) || VC_EXIT_CODE=1
-    - TESTCASES+="<testcase class='commit_checks.validate_commit' name='tools/validate-commit.py' time='1.0'"
-    - |
-      if [[ $VC_EXIT_CODE != 0 ]] ; then
-        TESTCASES+="><failure>Validate-commit check results:
-
-        $ANALYSIS_MESSAGE
-        </failure></testcase>"
-        FAILURE_COUNT=$(( FAILURE_COUNT + 1 ))
-      else
-        TESTCASES+="/>"
-      fi
-    - LC_EXIT_CODE=0
-    - ANALYSIS_MESSAGE=$( python3 tools/checklicenses.py ) || LC_EXIT_CODE=1
-    - TESTCASES+="<testcase class='commit_checks.check_licenses' name='tools/checklicenses.py' time='1.0'"
-    - |
-      if [[ $LC_EXIT_CODE != 0 ]] ; then
-        TESTCASES+="><failure>License check failure:
-
-        $ANALYSIS_MESSAGE
-        </failure></testcase>"
-        FAILURE_COUNT=$(( FAILURE_COUNT + 1 ))
-      else
-        TESTCASES+="/>"
-      fi
-    - HC_EXIT_CODE=0
-    - ANALYSIS_MESSAGE=$( python3 tools/check_help_urls.py ) || HC_EXIT_CODE=1
-    - TESTCASES+="<testcase class='commit_checks.check_help_urls' name='tools/check_help_urls.py' time='1.0'"
-    - |
-      if [[ $HC_EXIT_CODE != 0 ]] ; then
-        TESTCASES+="><failure>Help URL check failure:
-
-        $ANALYSIS_MESSAGE
-        </failure></testcase>"
-        FAILURE_COUNT=$(( FAILURE_COUNT + 1 ))
-      else
-        TESTCASES+="/>"
-      fi
-    - |
-      cat > commit_checks.xml <<FIN
-      <?xml version="1.0" encoding="utf-8"?>
-      <testsuites><testsuite name="Commit Checks" errors="0" failures="$FAILURE_COUNT" skipped="0" tests="5" time="5">
-      $TESTCASES
-      </testsuite></testsuites>
-      FIN
-    # - cat commit_checks.xml
-    - exit $(( PC_EXIT_CODE || VC_EXIT_CODE || LC_EXIT_CODE || HC_EXIT_CODE ))
+    # Let's generate a unit test report using tools/wrap-ci-test.py.
+    - REPORT_FILE=commit_checks.xml
+    - TEST_SUITE=commit_checks
+    - EXIT_CODE=0
+    - ./tools/wrap-ci-test.py --file $REPORT_FILE --suite $TEST_SUITE --case num_commits --command "[ $NUM_COMMITS -lt 2 ] || (echo 'ℹ️ This merge request has more than one commit. Please squash any trivial ones:\n'; git log --oneline --no-decorate --max-count=$NUM_COMMITS ; false)" || true
+    - ./tools/wrap-ci-test.py --file $REPORT_FILE --suite $TEST_SUITE --case tools/pre-commit ./tools/pre-commit $( git log --max-count=$NUM_COMMITS --pretty=format:%h ) || EXIT_CODE=1
+    - ./tools/wrap-ci-test.py --file $REPORT_FILE --suite $TEST_SUITE --case tools/validate-commit ./tools/validate-commit.py $( git log --max-count=$NUM_COMMITS --pretty=format:%h ) || EXIT_CODE=1
+    - ./tools/wrap-ci-test.py --file $REPORT_FILE --suite $TEST_SUITE --case tools/checklicenses ./tools/checklicenses.py || EXIT_CODE=1
+    - ./tools/wrap-ci-test.py --file $REPORT_FILE --suite $TEST_SUITE --case tools/check_help_urls ./tools/check_help_urls.py || EXIT_CODE=1
+    - exit $EXIT_CODE
   artifacts:
     when: always
     paths:

diff --git a/.mailmap b/.mailmap
@@ -165,14 +165,16 @@ Mehmet Oguz Sakaoglu <[email protected]> moguz <[email protected]
 Michael Oed <[email protected]> Mike78 <[email protected]>
 Michael Tüxen <[email protected]> <[email protected]>
 Michael Tüxen <[email protected]> <[email protected]>
-Michail Koreshkov <[email protected]> Michail Koreshkov <[email protected]>
+Michail Koreshkov <[email protected]> Michail Koreshkov <[email protected]>
+Michail Koreshkov <[email protected]> Mikhail Koreshkov <[email protected]>
+Mikhail Koreshkov <[email protected]> unknown <[email protected]>
+Michail Koreshkov <[email protected]> kor <[email protected]>
 Michał Łabędzki <[email protected]> Michal Labedzki <[email protected]>
 Michał Orynicz <[email protected]> michal.orynicz
 Michal Prívozník <[email protected]> <[email protected]>
 Michal Prívozník <[email protected]> <[email protected]>
 Mikael Kanstrup <[email protected]> Mikael Kanstrup <[email protected]>
 Mikael Kanstrup <[email protected]> Mikael Kanstrup <[email protected]>
-Mikhail Koreshkov <[email protected]> unknown <[email protected]>
 Milos Jovanovic <[email protected]> LoSmX <[email protected]>
 Moraney Jalil <[email protected]> moraney.jalil
 Moshe Kaplan <[email protected]> moshekaplan <[email protected]>

diff --git a/.well-known/funding-manifest-urls b/.well-known/funding-manifest-urls
@@ -0,0 +1 @@
+https://wiresharkfoundation.org/funding.json