diff options
| author | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2012-02-20 23:10:49 +0100 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2012-02-20 23:12:10 +0100 |
| commit | 97b1852f88379a29c9f6c92a0b80bdc2747828e9 (patch) | |
| tree | 04d2a5c59e2042aa5974a29d320cbec0adf31243 /lib/gnutls_constate.c | |
| parent | 1c80b5a09fef3c3dbf675cc38141d7ddd65a0ea2 (diff) | |
| download | gnutls-97b1852f88379a29c9f6c92a0b80bdc2747828e9.tar.gz | |
simplified the _datum functions.
Diffstat (limited to 'lib/gnutls_constate.c')
| -rw-r--r-- | lib/gnutls_constate.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/lib/gnutls_constate.c b/lib/gnutls_constate.c index deac62d642..730301081f 100644 --- a/lib/gnutls_constate.c +++ b/lib/gnutls_constate.c @@ -121,13 +121,13 @@ _gnutls_set_keys (gnutls_session_t session, record_parameters_st * params, if (hash_size > 0) { - if (_gnutls_sset_datum + if (_gnutls_set_datum (&client_write->mac_secret, &key_block[pos], hash_size) < 0) return gnutls_assert_val (GNUTLS_E_MEMORY_ERROR); pos += hash_size; - if (_gnutls_sset_datum + if (_gnutls_set_datum (&server_write->mac_secret, &key_block[pos], hash_size) < 0) return gnutls_assert_val (GNUTLS_E_MEMORY_ERROR); @@ -211,7 +211,7 @@ _gnutls_set_keys (gnutls_session_t session, record_parameters_st * params, pos += key_size; } - if (_gnutls_sset_datum + if (_gnutls_set_datum (&client_write->key, client_write_key, client_write_key_size) < 0) return gnutls_assert_val (GNUTLS_E_MEMORY_ERROR); @@ -221,7 +221,7 @@ _gnutls_set_keys (gnutls_session_t session, record_parameters_st * params, client_write_key_size, buf, sizeof (buf), NULL)); - if (_gnutls_sset_datum + if (_gnutls_set_datum (&server_write->key, server_write_key, server_write_key_size) < 0) return gnutls_assert_val (GNUTLS_E_MEMORY_ERROR); @@ -238,13 +238,13 @@ _gnutls_set_keys (gnutls_session_t session, record_parameters_st * params, */ if (IV_size > 0 && export_flag == 0) { - if (_gnutls_sset_datum + if (_gnutls_set_datum (&client_write->IV, &key_block[pos], IV_size) < 0) return gnutls_assert_val (GNUTLS_E_MEMORY_ERROR); pos += IV_size; - if (_gnutls_sset_datum + if (_gnutls_set_datum (&server_write->IV, &key_block[pos], IV_size) < 0) return gnutls_assert_val (GNUTLS_E_MEMORY_ERROR); @@ -280,10 +280,10 @@ _gnutls_set_keys (gnutls_session_t session, record_parameters_st * params, if (ret < 0) return gnutls_assert_val (ret); - if (_gnutls_sset_datum (&client_write->IV, iv_block, IV_size) < 0) + if (_gnutls_set_datum (&client_write->IV, iv_block, IV_size) < 0) return gnutls_assert_val (GNUTLS_E_MEMORY_ERROR); - if (_gnutls_sset_datum + if (_gnutls_set_datum (&server_write->IV, &iv_block[IV_size], IV_size) < 0) return gnutls_assert_val (GNUTLS_E_MEMORY_ERROR); } |