Skip to content

nginx-ssl-ja3: grease ciphers #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 10, 2019
Merged

nginx-ssl-ja3: grease ciphers #7

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 16 additions & 13 deletions src/ngx_ssl_ja3.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,8 @@ ngx_ssl_ja3_detail_print(ngx_pool_t *pool, ngx_ssl_ja3_t *ja3)
void
ngx_ssl_ja3_fp(ngx_pool_t *pool, ngx_ssl_ja3_t *ja3, ngx_str_t *out)
{
size_t len = 0, cur = 0;
size_t len = 0, cur = 0, added = 0;
unsigned short us = 0;

if (pool == NULL || ja3 == NULL || out == NULL) {
return;
Expand Down Expand Up @@ -229,12 +230,18 @@ ngx_ssl_ja3_fp(ngx_pool_t *pool, ngx_ssl_ja3_t *ja3, ngx_str_t *out)

if (ja3->ciphers_sz) {
for (size_t i = 0; i < ja3->ciphers_sz; ++i) {
if (i > 0) {
ngx_snprintf(out->data + (cur++), 1, "-");
us = ntohs(ja3->ciphers[i]);
if (!ngx_ssl_ja3_is_ext_greased(us)) {
if (added > 0) {
ngx_snprintf(out->data + (cur++), 1, "-");
}
len = ngx_ssj_ja3_num_digits(us);
ngx_snprintf(out->data + cur, len, "%d", us);
cur += len;
if (added == 0) {
added = 1;
}
}
len = ngx_ssj_ja3_num_digits(ja3->ciphers[i]);
ngx_snprintf(out->data + cur, len, "%d", ja3->ciphers[i]);
cur += len;
}
}
ngx_snprintf(out->data + (cur++), 1, ",");
Expand Down Expand Up @@ -297,6 +304,7 @@ ngx_ssl_ja3(ngx_connection_t *c, ngx_pool_t *pool, ngx_ssl_ja3_t *ja3) {
int *curves_out = NULL;
int *point_formats_out = NULL;
size_t len = 0;
unsigned short us = 0;

if (! c->ssl) {
return NGX_DECLINED;
Expand Down Expand Up @@ -330,13 +338,7 @@ ngx_ssl_ja3(ngx_connection_t *c, ngx_pool_t *pool, ngx_ssl_ja3_t *ja3) {
if (ja3->ciphers == NULL) {
return NGX_DECLINED;
}

ngx_memcpy(ja3->ciphers, ciphers_out, len);
#if NGX_HAVE_LITTLE_ENDIAN
for (size_t i = 0; i < ja3->ciphers_sz; ++i) {
ja3->ciphers[i] = (ja3->ciphers[i] >> 8) | (ja3->ciphers[i] << 8);
}
#endif
}

/* Extensions */
Expand All @@ -349,7 +351,8 @@ ngx_ssl_ja3(ngx_connection_t *c, ngx_pool_t *pool, ngx_ssl_ja3_t *ja3) {
return NGX_DECLINED;
}
for (size_t i = 0; i < c->ssl->client_extensions_size; ++i) {
if (! ngx_ssl_ja3_is_ext_greased(c->ssl->client_extensions[i])) {
us = ntohs(c->ssl->client_extensions[i]);
if (! ngx_ssl_ja3_is_ext_greased(us)) {
ja3->extensions[ja3->extensions_sz++] =
c->ssl->client_extensions[i];
}
Expand Down