mirror of
https://github.com/adulau/ssldump.git
synced 2024-12-04 23:37:12 +00:00
Compare commits
26 commits
594de65d62
...
d212450f58
Author | SHA1 | Date | |
---|---|---|---|
|
d212450f58 | ||
0282281a4b | |||
|
c47ce6998c | ||
61e0071572 | |||
b31ef76274 | |||
d70855020e | |||
|
c339dda2f7 | ||
|
00171e1bf9 | ||
|
5c20a7401b | ||
|
ad330211e2 | ||
f24cf1476c | |||
|
0ac964a418 | ||
de20cad354 | |||
|
ec6c02d028 | ||
c755079045 | |||
|
c8b51f3f59 | ||
d02412720b | |||
7d56234008 | |||
|
50225a3b72 | ||
|
e5f2916b65 | ||
89ed604ddc | |||
b2d3cf387a | |||
a43257ce50 | |||
e0f787da52 | |||
2774e51db6 | |||
|
72d9e2b35f |
6 changed files with 85 additions and 4 deletions
4
.github/workflows/codeql-analysis.yml
vendored
4
.github/workflows/codeql-analysis.yml
vendored
|
@ -26,7 +26,7 @@ jobs:
|
||||||
- name: Checkout repository
|
- name: Checkout repository
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v4
|
||||||
- name: Initialize CodeQL
|
- name: Initialize CodeQL
|
||||||
uses: github/codeql-action/init@v2
|
uses: github/codeql-action/init@v3
|
||||||
with:
|
with:
|
||||||
languages: ${{ matrix.language }}
|
languages: ${{ matrix.language }}
|
||||||
- name: Build Application using script
|
- name: Build Application using script
|
||||||
|
@ -35,6 +35,6 @@ jobs:
|
||||||
cmake -B ${{github.workspace}}/build -G Ninja
|
cmake -B ${{github.workspace}}/build -G Ninja
|
||||||
ninja -C ${{github.workspace}}/build
|
ninja -C ${{github.workspace}}/build
|
||||||
- name: Perform CodeQL Analysis
|
- name: Perform CodeQL Analysis
|
||||||
uses: github/codeql-action/analyze@v2
|
uses: github/codeql-action/analyze@v3
|
||||||
with:
|
with:
|
||||||
category: "/language:${{matrix.language}}"
|
category: "/language:${{matrix.language}}"
|
||||||
|
|
73
.github/workflows/scorecard.yml
vendored
Normal file
73
.github/workflows/scorecard.yml
vendored
Normal file
|
@ -0,0 +1,73 @@
|
||||||
|
# This workflow uses actions that are not certified by GitHub. They are provided
|
||||||
|
# by a third-party and are governed by separate terms of service, privacy
|
||||||
|
# policy, and support documentation.
|
||||||
|
|
||||||
|
name: Scorecard supply-chain security
|
||||||
|
on:
|
||||||
|
# For Branch-Protection check. Only the default branch is supported. See
|
||||||
|
# https://github.com/ossf/scorecard/blob/main/docs/checks.md#branch-protection
|
||||||
|
branch_protection_rule:
|
||||||
|
# To guarantee Maintained check is occasionally updated. See
|
||||||
|
# https://github.com/ossf/scorecard/blob/main/docs/checks.md#maintained
|
||||||
|
schedule:
|
||||||
|
- cron: '33 14 * * 6'
|
||||||
|
push:
|
||||||
|
branches: [ "master" ]
|
||||||
|
|
||||||
|
# Declare default permissions as read only.
|
||||||
|
permissions: read-all
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
analysis:
|
||||||
|
name: Scorecard analysis
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
permissions:
|
||||||
|
# Needed to upload the results to code-scanning dashboard.
|
||||||
|
security-events: write
|
||||||
|
# Needed to publish results and get a badge (see publish_results below).
|
||||||
|
id-token: write
|
||||||
|
# Uncomment the permissions below if installing in a private repository.
|
||||||
|
# contents: read
|
||||||
|
# actions: read
|
||||||
|
|
||||||
|
steps:
|
||||||
|
- name: "Checkout code"
|
||||||
|
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
|
||||||
|
with:
|
||||||
|
persist-credentials: false
|
||||||
|
|
||||||
|
- name: "Run analysis"
|
||||||
|
uses: ossf/scorecard-action@62b2cac7ed8198b15735ed49ab1e5cf35480ba46 # v2.4.0
|
||||||
|
with:
|
||||||
|
results_file: results.sarif
|
||||||
|
results_format: sarif
|
||||||
|
# (Optional) "write" PAT token. Uncomment the `repo_token` line below if:
|
||||||
|
# - you want to enable the Branch-Protection check on a *public* repository, or
|
||||||
|
# - you are installing Scorecard on a *private* repository
|
||||||
|
# To create the PAT, follow the steps in https://github.com/ossf/scorecard-action?tab=readme-ov-file#authentication-with-fine-grained-pat-optional.
|
||||||
|
# repo_token: ${{ secrets.SCORECARD_TOKEN }}
|
||||||
|
|
||||||
|
# Public repositories:
|
||||||
|
# - Publish results to OpenSSF REST API for easy access by consumers
|
||||||
|
# - Allows the repository to include the Scorecard badge.
|
||||||
|
# - See https://github.com/ossf/scorecard-action#publishing-results.
|
||||||
|
# For private repositories:
|
||||||
|
# - `publish_results` will always be set to `false`, regardless
|
||||||
|
# of the value entered here.
|
||||||
|
publish_results: true
|
||||||
|
|
||||||
|
# Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
|
||||||
|
# format to the repository Actions tab.
|
||||||
|
- name: "Upload artifact"
|
||||||
|
uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
|
||||||
|
with:
|
||||||
|
name: SARIF file
|
||||||
|
path: results.sarif
|
||||||
|
retention-days: 5
|
||||||
|
|
||||||
|
# Upload the results to GitHub's code scanning dashboard (optional).
|
||||||
|
# Commenting out will disable upload of results to your repo's Code Scanning dashboard
|
||||||
|
- name: "Upload to code-scanning"
|
||||||
|
uses: github/codeql-action/upload-sarif@1b1aada464948af03b950897e5eb522f92603cc2 # v3.24.9
|
||||||
|
with:
|
||||||
|
sarif_file: results.sarif
|
|
@ -2,6 +2,7 @@
|
||||||
|
|
||||||
[![Build CI](https://github.com/adulau/ssldump/actions/workflows/build.yml/badge.svg)](https://github.com/adulau/ssldump/actions/workflows/build.yml)
|
[![Build CI](https://github.com/adulau/ssldump/actions/workflows/build.yml/badge.svg)](https://github.com/adulau/ssldump/actions/workflows/build.yml)
|
||||||
[![CodeQL analysis](https://github.com/adulau/ssldump/actions/workflows/codeql-analysis.yml/badge.svg)](https://github.com/adulau/ssldump/actions/workflows/codeql-analysis.yml)
|
[![CodeQL analysis](https://github.com/adulau/ssldump/actions/workflows/codeql-analysis.yml/badge.svg)](https://github.com/adulau/ssldump/actions/workflows/codeql-analysis.yml)
|
||||||
|
[![OpenSSF Scorecard](https://api.securityscorecards.dev/projects/github.com/adulau/ssldump/badge)](https://securityscorecards.dev/viewer/?uri=github.com/adulau/ssldump)
|
||||||
|
|
||||||
# Release and tagging
|
# Release and tagging
|
||||||
|
|
||||||
|
|
|
@ -54,7 +54,11 @@ static int init_pcap_logger(void *data) {
|
||||||
}
|
}
|
||||||
|
|
||||||
static int deinit_pcap_logger(void) {
|
static int deinit_pcap_logger(void) {
|
||||||
|
#if defined(_POSIX_SYNCHRONIZED_IO) && (_POSIX_SYNCHRONIZED_IO > 0)
|
||||||
fdatasync(pcap_fd);
|
fdatasync(pcap_fd);
|
||||||
|
#else
|
||||||
|
fsync(pcap_fd);
|
||||||
|
#endif
|
||||||
close(pcap_fd);
|
close(pcap_fd);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
|
@ -244,7 +244,7 @@ static int decode_HandshakeType_ClientHello(ssl_obj *ssl,
|
||||||
SSL_DECODE_UINT16(ssl, "extensions len", 0, data, &exlen);
|
SSL_DECODE_UINT16(ssl, "extensions len", 0, data, &exlen);
|
||||||
if(exlen) {
|
if(exlen) {
|
||||||
explain(ssl, "extensions\n");
|
explain(ssl, "extensions\n");
|
||||||
while(data->len) {
|
while(data->len > 0) {
|
||||||
SSL_DECODE_UINT16(ssl, "extension type", 0, data, &ex);
|
SSL_DECODE_UINT16(ssl, "extension type", 0, data, &ex);
|
||||||
if(!ja3_ex_str)
|
if(!ja3_ex_str)
|
||||||
ja3_ex_str = calloc(7, 1);
|
ja3_ex_str = calloc(7, 1);
|
||||||
|
@ -1714,6 +1714,7 @@ decoder extension_decoder[] = {
|
||||||
{55, "external_id_hash", decode_extension},
|
{55, "external_id_hash", decode_extension},
|
||||||
{56, "external_session_id", decode_extension},
|
{56, "external_session_id", decode_extension},
|
||||||
{13172, "next_protocol_negotiation", decode_extension},
|
{13172, "next_protocol_negotiation", decode_extension},
|
||||||
|
{0xfe0d, "encrypted_client_hello", decode_extension},
|
||||||
{0xff01, "renegotiation_info", decode_extension},
|
{0xff01, "renegotiation_info", decode_extension},
|
||||||
{-1}};
|
{-1}};
|
||||||
|
|
||||||
|
|
|
@ -555,6 +555,7 @@ int ssl_restore_session(ssl_obj *ssl, ssl_decoder *d) {
|
||||||
case TLSV1_VERSION:
|
case TLSV1_VERSION:
|
||||||
case TLSV11_VERSION:
|
case TLSV11_VERSION:
|
||||||
case TLSV12_VERSION:
|
case TLSV12_VERSION:
|
||||||
|
case TLSV13_VERSION:
|
||||||
if((r = ssl_generate_keying_material(ssl, d)))
|
if((r = ssl_generate_keying_material(ssl, d)))
|
||||||
ABORT(r);
|
ABORT(r);
|
||||||
break;
|
break;
|
||||||
|
@ -658,6 +659,7 @@ int ssl_process_client_key_exchange(ssl_obj *ssl,
|
||||||
case TLSV1_VERSION:
|
case TLSV1_VERSION:
|
||||||
case TLSV11_VERSION:
|
case TLSV11_VERSION:
|
||||||
case TLSV12_VERSION:
|
case TLSV12_VERSION:
|
||||||
|
case TLSV13_VERSION:
|
||||||
if((r = ssl_generate_keying_material(ssl, d)))
|
if((r = ssl_generate_keying_material(ssl, d)))
|
||||||
ABORT(r);
|
ABORT(r);
|
||||||
break;
|
break;
|
||||||
|
|
Loading…
Reference in a new issue