diff options
author | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2011-02-07 08:34:31 +0100 |
---|---|---|
committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2011-02-07 08:34:31 +0100 |
commit | 8316c2ecaad8d1fc10549c8b49ef31a8271a956b (patch) | |
tree | 29c8e15549d9c1da359700dac51b5b7cda3ab4e0 /lib/gnutls_cipher.c | |
parent | 0567caaa942f2e0ecf6158a5821dc1ef415f9159 (diff) | |
download | gnutls-8316c2ecaad8d1fc10549c8b49ef31a8271a956b.tar.gz |
calculation for c_length occurs in a single place.
Diffstat (limited to 'lib/gnutls_cipher.c')
-rw-r--r-- | lib/gnutls_cipher.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/lib/gnutls_cipher.c b/lib/gnutls_cipher.c index 53ca23ea5f..afb387b535 100644 --- a/lib/gnutls_cipher.c +++ b/lib/gnutls_cipher.c @@ -269,12 +269,15 @@ calc_enc_length (gnutls_session_t session, int data_size, #define PREAMBLE_SIZE 16 static inline int -make_preamble (opaque * uint64_data, opaque type, uint16_t c_length, +make_preamble (opaque * uint64_data, opaque type, int length, opaque ver, opaque * preamble) { opaque minor = _gnutls_version_get_minor (ver); opaque major = _gnutls_version_get_major (ver); opaque *p = preamble; + uint16_t c_length; + + c_length = _gnutls_conv_uint16 (length); memcpy (p, uint64_data, 8); p += 8; @@ -317,7 +320,6 @@ _gnutls_compressed2ciphertext (gnutls_session_t session, record_parameters_st * params) { uint8_t * tag_ptr = NULL; - uint16_t c_length; uint8_t pad; int length, length_to_encrypt, ret; opaque preamble[PREAMBLE_SIZE]; @@ -331,12 +333,11 @@ _gnutls_compressed2ciphertext (gnutls_session_t session, int explicit_iv = _gnutls_version_has_explicit_iv (session->security_parameters.version); int auth_cipher = _gnutls_auth_cipher_is_aead(¶ms->write.cipher_state); - c_length = _gnutls_conv_uint16 (compressed.size); preamble_size = make_preamble (UINT64DATA (params->write.sequence_number), - type, c_length, ver, preamble); + type, compressed.size, ver, preamble); /* Calculate the encrypted length (padding etc.) */ @@ -436,7 +437,6 @@ _gnutls_ciphertext2compressed (gnutls_session_t session, record_parameters_st * params) { uint8_t tag[MAX_HASH_SIZE]; - uint16_t c_length; uint8_t pad; int length, length_to_decrypt; uint16_t blocksize; @@ -487,7 +487,6 @@ _gnutls_ciphertext2compressed (gnutls_session_t session, } length = ciphertext.size - tag_size; - c_length = _gnutls_conv_uint16 ((uint16_t) (length)); /* Pass the type, version, length and compressed through * MAC. @@ -495,7 +494,7 @@ _gnutls_ciphertext2compressed (gnutls_session_t session, preamble_size = make_preamble (UINT64DATA (params->read.sequence_number), type, - c_length, ver, preamble); + length, ver, preamble); _gnutls_auth_cipher_add_auth (¶ms->read.cipher_state, preamble, preamble_size); @@ -564,7 +563,6 @@ _gnutls_ciphertext2compressed (gnutls_session_t session, if (length < 0) length = 0; - c_length = _gnutls_conv_uint16 ((uint16_t) length); /* Pass the type, version, length and compressed through * MAC. @@ -572,7 +570,7 @@ _gnutls_ciphertext2compressed (gnutls_session_t session, preamble_size = make_preamble (UINT64DATA (params->read.sequence_number), type, - c_length, ver, preamble); + length, ver, preamble); _gnutls_auth_cipher_add_auth (¶ms->read.cipher_state, preamble, preamble_size); _gnutls_auth_cipher_add_auth (¶ms->read.cipher_state, ciphertext.data, length); |