ims-volte-vowifi
/
strongswan
9
0
Fork 0
Code Pull Requests Releases Activity

tls-hkdf: Support updating client/server traffic secrets

This commit is contained in:
Tobias Brunner 2020-08-27 11:50:00 +02:00
parent 09fbaad6bd
commit b51c1d468e
2 changed files with 48 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
src/libtls/tls_hkdf.c
View File

@ -403,27 +403,61 @@ METHOD(tls_hkdf_t, generate_secret, bool,
return FALSE; return FALSE;
} }
break; break;
case TLS_HKDF_UPD_C_TRAFFIC:
case TLS_HKDF_UPD_S_TRAFFIC:
if (this->phase != HKDF_PHASE_3)
{
DBG1(DBG_TLS, "unable to update traffic keys");
return FALSE;
}
break;
default: default:
DBG1(DBG_TLS, "invalid HKDF label"); DBG1(DBG_TLS, "invalid HKDF label");
return FALSE; return FALSE;
} }
if (!derive_secret(this, chunk_from_str(hkdf_labels[label]), messages)) if (label == TLS_HKDF_UPD_C_TRAFFIC || label == TLS_HKDF_UPD_S_TRAFFIC)
{ {
DBG1(DBG_TLS, "unable to derive secret"); chunk_t previous = this->client_traffic_secret;
return FALSE;
if (label == TLS_HKDF_UPD_S_TRAFFIC)
{
previous = this->server_traffic_secret;
}
if (!expand_label(this, previous, chunk_from_str("tls13 traffic upd"),
chunk_empty, this->hasher->get_hash_size(this->hasher),
&this->okm))
{
DBG1(DBG_TLS, "unable to update secret");
return FALSE;
}
}
else
{
if (!derive_secret(this, chunk_from_str(hkdf_labels[label]), messages))
{
DBG1(DBG_TLS, "unable to derive secret");
return FALSE;
}
} }
if (label == TLS_HKDF_C_HS_TRAFFIC || label == TLS_HKDF_C_AP_TRAFFIC) switch (label)
{ {
chunk_clear(&this->client_traffic_secret); case TLS_HKDF_C_HS_TRAFFIC:
this->client_traffic_secret = chunk_clone(this->okm); case TLS_HKDF_C_AP_TRAFFIC:
} case TLS_HKDF_UPD_C_TRAFFIC:
chunk_clear(&this->client_traffic_secret);
if (label == TLS_HKDF_S_HS_TRAFFIC || label == TLS_HKDF_S_AP_TRAFFIC) this->client_traffic_secret = chunk_clone(this->okm);
{ break;
chunk_clear(&this->server_traffic_secret); case TLS_HKDF_S_HS_TRAFFIC:
this->server_traffic_secret = chunk_clone(this->okm); case TLS_HKDF_S_AP_TRAFFIC:
case TLS_HKDF_UPD_S_TRAFFIC:
chunk_clear(&this->server_traffic_secret);
this->server_traffic_secret = chunk_clone(this->okm);
break;
default:
break;
} }
if (secret) if (secret)

2
src/libtls/tls_hkdf.h
View File

@ -42,6 +42,8 @@ enum tls_hkdf_label_t {
TLS_HKDF_S_AP_TRAFFIC, TLS_HKDF_S_AP_TRAFFIC,
TLS_HKDF_EXP_MASTER, TLS_HKDF_EXP_MASTER,
TLS_HKDF_RES_MASTER, TLS_HKDF_RES_MASTER,
TLS_HKDF_UPD_C_TRAFFIC,
TLS_HKDF_UPD_S_TRAFFIC,
}; };
/** /**