Changed peetprint, ordering extensions

Author: pagpeter

README.md

@@ -36,8 +36,9 @@ I wanted to extend JA3, so I created my own TLS fingerprint algorithm. It's bett
 It looks like this:
 
 ```
-supported-tls-versions|supported-protocols|supported-groups|supported-signature-algorithms|psk-key-exchange-mode|certificate-compression-algorithms|cipher-suites|extensions
+supported-tls-versions|supported-protocols|supported-groups|supported-signature-algorithms|psk-key-exchange-mode|certificate-compression-algorithms|cipher-suites|sorted-extensions
 ```
+
 "-" is used as the seperator.
 
 **supported-tls-versions**: Seperated list of supported TLS versions as sent in the `supported_versions` extension.
@@ -54,7 +55,7 @@ supported-tls-versions|supported-protocols|supported-groups|supported-signature-
 
 **cipher-suites**: Seperated list of the supported cipher suites.
 
-**extensions**: Seperated list of the supported extensions.
+**sorted-extensions**: Sorted list of the supported extensions. (Sorted because of order randomization used by chrome)
 
 All TLS GREASE values must be replaced with "GREASE".
 

fingerprint_tls.go

@@ -2,6 +2,7 @@ package main
 
 import (
 	"fmt"
+	"sort"
 	"strconv"
 	"strings"
 )
@@ -149,6 +150,9 @@ func CalculatePeetPrint(parsed ClientHello, j JA3Calculating) (string, string) {
 		}
 	}
 
+	// Sort extensions because the order is randomized
+	sort.Strings(j.PeetPrintExtensions)
+
 	tls_versions := strings.Join(versions, "-")                  // Comma seperated list of supported TLS versions as sent in the `supported_versions` extension. TODO
 	protos := strings.Join(tmp, "-")                             // Comma seperated list of supported HTTP versions as sent in the `application_layer_protocol_negotiation` extension. http/1.0 => 1.0, http/1.1 => 1.1, http/2 => 2
 	sig_als := joinInts(parsed.SignatureAlgorithms, "-")         // Comma seperated list of supported signatue algorithms as sent in the `signature_algorithms` extension.
@@ -158,16 +162,16 @@ func CalculatePeetPrint(parsed ClientHello, j JA3Calculating) (string, string) {
 	suites := strings.Join(j.PeetPrintCiphers, "-")              // Cipher suites
 	extensions := strings.Join(j.PeetPrintExtensions, "-")       // Extensions
 
-//	if debug {
-//		fmt.Println("tls_versions:", tls_versions)
-//		fmt.Println("protos:", protos)
-//		fmt.Println("signature algs:", sig_als)
-//		fmt.Println("key_mode:", key_mode)
-//		fmt.Println("comp_algs:", comp_algs)
-//		fmt.Println("groups:", groups)
-//		fmt.Println("cipher suites:", suites)
-//		fmt.Println("extensions:", extensions)
-//	}
+	//	if debug {
+	//		fmt.Println("tls_versions:", tls_versions)
+	//		fmt.Println("protos:", protos)
+	//		fmt.Println("signature algs:", sig_als)
+	//		fmt.Println("key_mode:", key_mode)
+	//		fmt.Println("comp_algs:", comp_algs)
+	//		fmt.Println("groups:", groups)
+	//		fmt.Println("cipher suites:", suites)
+	//		fmt.Println("extensions:", extensions)
+	//	}
 
 	fp := fmt.Sprintf("%v|%v|%v|%v|%v|%v|%v|%v", tls_versions, protos, groups, sig_als, key_mode, comp_algs, suites, extensions)
 	return fp, GetMD5Hash(fp)

structs.go

@@ -15,8 +15,8 @@ type TLSDetails struct {
 	JA3     string `json:"ja3"`
 	JA3Hash string `json:"ja3_hash"`
 
-	PeetPrint     string `json:"peetprint (WIP)"`
-	PeetPrintHash string `json:"peetprint_hash (WIP)"`
+	PeetPrint     string `json:"peetprint"`
+	PeetPrintHash string `json:"peetprint_hash"`
 
 	ClientRandom string `json:"client_random"`
 	SessionID    string `json:"session_id"`