diff options
| author | 刘学利 <[email protected]> | 2020-09-23 15:14:55 +0800 |
|---|---|---|
| committer | 刘学利 <[email protected]> | 2020-09-23 15:14:55 +0800 |
| commit | 69f37421670b3b02ca77aff560e516d54935b229 (patch) | |
| tree | 40000a9be1e3bfc705946201955ea868bae72ce5 | |
| parent | 0068bd9a6a7fecdf346d9a7140fd334bb1af53e3 (diff) | |
| parent | 9f1872e6f70370a1fca75ae98478ae025ed54cf2 (diff) | |
Merge branch 'develop' into 'master'v1.0.9
修复BUG：JA3原始串拼接不完整导致指纹计算错误
See merge request MESA_Platform/ssl!10
| -rw-r--r-- | src/SSl_ja3_fingerprint.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/SSl_ja3_fingerprint.cpp b/src/SSl_ja3_fingerprint.cpp index cc20c48..f5fdb84 100644 --- a/src/SSl_ja3_fingerprint.cpp +++ b/src/SSl_ja3_fingerprint.cpp @@ -426,7 +426,7 @@ static int ssl_generate_ja3_fingerprint(const unsigned char *data, int len, char BSB ecja3bsb; BSB_INIT(sslbsb, data, len); - BSB_INIT(ja3bsb, ja3_fp, sizeof(ja3_fp)); + BSB_INIT(ja3bsb, ja3_fp, ja3_fp_len); BSB_INIT(ecja3bsb, ecja3, sizeof(ecja3)); BSB_INIT(ecfja3bsb, ecfja3, sizeof(ecfja3)); BSB_INIT(eja3bsb, eja3, sizeof(eja3)); @@ -585,13 +585,10 @@ static int ssl_generate_ja3_fingerprint(const unsigned char *data, int len, char } BSB_IMPORT_skip(sslbsb, ssllen + 5); -#if 0 if (BSB_LENGTH(ja3bsb) > 0 && BSB_NOT_ERROR(ja3bsb) && BSB_NOT_ERROR(ecja3bsb) && BSB_NOT_ERROR(eja3bsb) && BSB_NOT_ERROR(ecfja3bsb)) { BSB_EXPORT_sprintf(ja3bsb, "%.*s,%.*s,%.*s", (int)BSB_LENGTH(eja3bsb), eja3, (int)BSB_LENGTH(ecja3bsb), ecja3, (int)BSB_LENGTH(ecfja3bsb), ecfja3); - printf("JA3: %s\n", ja3_fp); } -#endif return 1; } |