adulau/ssldump
1
0
Fork 0
mirror of https://github.com/adulau/ssldump.git synced 2024-11-21 17:07:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

Compare commits

base: adulau:262ce1cf8d42375c5c1349185b290fd54d147492
Branches Tags
adulau:master
adulau:revert-88-raw-ip
adulau:v1.9
adulau:v1.8
adulau:v1.7
adulau:v1.6
adulau:v1.5
adulau:v1.4
adulau:v1.3
adulau:v1.2
adulau:v1.1
adulau:v1.0
...
compare: adulau:f79821d521f5146f07865eaa1b26e1315ae1fa4f
Branches Tags
adulau:master
adulau:revert-88-raw-ip
adulau:v1.9
adulau:v1.8
adulau:v1.7
adulau:v1.6
adulau:v1.5
adulau:v1.4
adulau:v1.3
adulau:v1.2
adulau:v1.1
adulau:v1.0

8 commits
262ce1cf8d ... f79821d521

Author SHA1 Message Date
Sergei
f79821d521
Merge e77e8abc18 into 61e0071572 2024-08-21 14:13:01 +02:00
Alexandre Dulaunoy
61e0071572
Merge pull request #112 from adulau/dependabot/github_actions/actions/upload-artifact-4.3.6 
Bump actions/upload-artifact from 4.3.4 to 4.3.6
 2024-08-21 14:12:52 +02:00
Alexandre Dulaunoy
b31ef76274
Merge pull request #108 from adulau/dependabot/github_actions/ossf/scorecard-action-2.4.0 
Bump ossf/scorecard-action from 2.3.3 to 2.4.0
 2024-08-21 14:12:37 +02:00
Alexandre Dulaunoy
d70855020e
Merge pull request #111 from 1div0/ECH 
ECH
 2024-08-21 14:11:46 +02:00
dependabot[bot]
c339dda2f7
Bump actions/upload-artifact from 4.3.4 to 4.3.6 
Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 4.3.4 to 4.3.6.
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](0b2256b8c0...834a144ee9)

---
updated-dependencies:
- dependency-name: actions/upload-artifact
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-08-12 04:33:03 +00:00
Peter Kovář
00171e1bf9 Add ECH 
Signed-off-by: Peter Kovář <peter.kovar@reflexion.tv>
 2024-08-10 20:29:32 +02:00
Peter Kovář
5c20a7401b Add TLS Version 1.3 Handling 
Signed-off-by: Peter Kovář <peter.kovar@reflexion.tv>
 2024-08-10 20:26:32 +02:00
dependabot[bot]
ad330211e2
Bump ossf/scorecard-action from 2.3.3 to 2.4.0 
Bumps [ossf/scorecard-action](https://github.com/ossf/scorecard-action) from 2.3.3 to 2.4.0.
- [Release notes](https://github.com/ossf/scorecard-action/releases)
- [Changelog](https://github.com/ossf/scorecard-action/blob/main/RELEASE.md)
- [Commits](dc50aa9510...62b2cac7ed)

---
updated-dependencies:
- dependency-name: ossf/scorecard-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-07-29 04:49:26 +00:00
3 changed files with 6 additions and 3 deletions
Show stats Expand all files Collapse all files

4
.github/workflows/scorecard.yml vendored
View file

@ -37,7 +37,7 @@ jobs:
persist-credentials: false persist-credentials: false
- name: "Run analysis" - name: "Run analysis"
uses: ossf/scorecard-action@dc50aa9510b46c811795eb24b2f1ba02a914e534 # v2.3.3 uses: ossf/scorecard-action@62b2cac7ed8198b15735ed49ab1e5cf35480ba46 # v2.4.0
with: with:
results_file: results.sarif results_file: results.sarif
results_format: sarif results_format: sarif
@ -59,7 +59,7 @@ jobs:
# Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF # Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
# format to the repository Actions tab. # format to the repository Actions tab.
- name: "Upload artifact" - name: "Upload artifact"
uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4.3.4 uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a # v4.3.6
with: with:
name: SARIF file name: SARIF file
path: results.sarif path: results.sarif

3
ssl/ssl.enums.c
View file

@ -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}};

2
ssl/ssldecode.c
View file

@ -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;
@ -655,6 +656,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;