diff options
Diffstat (limited to 'lib/prf.c')
| -rw-r--r-- | lib/prf.c | 58 |
1 files changed, 24 insertions, 34 deletions
@@ -71,8 +71,7 @@ int gnutls_prf_raw(gnutls_session_t session, size_t label_size, const char *label, - size_t seed_size, const char *seed, size_t outsize, - char *out) + size_t seed_size, const char *seed, size_t outsize, char *out) { int ret; const version_entry_st *vers = get_version(session); @@ -84,21 +83,20 @@ gnutls_prf_raw(gnutls_session_t session, return gnutls_assert_val(GNUTLS_E_INVALID_REQUEST); ret = _gnutls_prf_raw(session->security_parameters.prf->id, - GNUTLS_MASTER_SIZE, session->security_parameters.master_secret, - label_size, label, - seed_size, (uint8_t *) seed, - outsize, out); + GNUTLS_MASTER_SIZE, + session->security_parameters.master_secret, + label_size, label, seed_size, (uint8_t *) seed, + outsize, out); return ret; } static int -_tls13_derive_exporter(const mac_entry_st *prf, +_tls13_derive_exporter(const mac_entry_st * prf, gnutls_session_t session, size_t label_size, const char *label, size_t context_size, const char *context, - size_t outsize, char *out, - bool early) + size_t outsize, char *out, bool early) { uint8_t secret[MAX_HASH_SIZE]; uint8_t digest[MAX_HASH_SIZE]; @@ -106,20 +104,18 @@ _tls13_derive_exporter(const mac_entry_st *prf, int ret; ret = _tls13_derive_secret2(prf, label, label_size, NULL, 0, - session->key.proto.tls13.ap_expkey, - secret); + session->key.proto.tls13.ap_expkey, secret); if (ret < 0) return gnutls_assert_val(ret); - ret = gnutls_hash_fast((gnutls_digest_algorithm_t)prf->id, + ret = gnutls_hash_fast((gnutls_digest_algorithm_t) prf->id, context, context_size, digest); if (ret < 0) return gnutls_assert_val(ret); return _tls13_expand_secret2(prf, - EXPORTER_LABEL, sizeof(EXPORTER_LABEL)-1, - digest, digest_size, - secret, outsize, out); + EXPORTER_LABEL, sizeof(EXPORTER_LABEL) - 1, + digest, digest_size, secret, outsize, out); } /** @@ -176,25 +172,24 @@ gnutls_prf_rfc5705(gnutls_session_t session, session, label_size, label, context_size, context, - outsize, out, - 0); + outsize, out, 0); } else { char *pctx = NULL; - if (context != NULL && context_size > 65535) { + if (context != NULL && context_size > 65535) { gnutls_assert(); return GNUTLS_E_INVALID_REQUEST; } if (context != NULL) { - pctx = gnutls_malloc(context_size+2); + pctx = gnutls_malloc(context_size + 2); if (!pctx) { gnutls_assert(); return GNUTLS_E_MEMORY_ERROR; } - memcpy(pctx+2, context, context_size); - _gnutls_write_uint16(context_size, (void*)pctx); + memcpy(pctx + 2, context, context_size); + _gnutls_write_uint16(context_size, (void *)pctx); context_size += 2; } @@ -254,9 +249,7 @@ gnutls_prf_early(gnutls_session_t session, return _tls13_derive_exporter(session->key.binders[0].prf, session, label_size, label, - context_size, context, - outsize, out, - 1); + context_size, context, outsize, out, 1); } /** @@ -299,8 +292,7 @@ gnutls_prf(gnutls_session_t session, size_t label_size, const char *label, int server_random_first, - size_t extra_size, const char *extra, - size_t outsize, char *out) + size_t extra_size, const char *extra, size_t outsize, char *out) { int ret; uint8_t *seed; @@ -310,7 +302,8 @@ gnutls_prf(gnutls_session_t session, if (vers && vers->tls13_sem) { if (extra == NULL && server_random_first == 0) return gnutls_prf_rfc5705(session, label_size, label, - extra_size, extra, outsize, out); + extra_size, extra, outsize, + out); else return gnutls_assert_val(GNUTLS_E_INVALID_REQUEST); } @@ -326,8 +319,7 @@ gnutls_prf(gnutls_session_t session, memcpy(seed, server_random_first ? session->security_parameters.server_random : - session->security_parameters.client_random, - GNUTLS_RANDOM_SIZE); + session->security_parameters.client_random, GNUTLS_RANDOM_SIZE); memcpy(seed + GNUTLS_RANDOM_SIZE, server_random_first ? session->security_parameters. client_random : session->security_parameters.server_random, @@ -339,13 +331,11 @@ gnutls_prf(gnutls_session_t session, ret = _gnutls_prf_raw(session->security_parameters.prf->id, - GNUTLS_MASTER_SIZE, session->security_parameters.master_secret, - label_size, label, - seedsize, seed, - outsize, out); + GNUTLS_MASTER_SIZE, + session->security_parameters.master_secret, + label_size, label, seedsize, seed, outsize, out); gnutls_free(seed); return ret; } - |