diff options
| author | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2001-08-25 09:19:08 +0000 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2001-08-25 09:19:08 +0000 |
| commit | 3d1c141575c1c58789aff5b38ec5dd6b479d6564 (patch) | |
| tree | 00868ec140dce93a7501912362dec84e49f7a27b /lib/gnutls_cipher.c | |
| parent | 76ba54e2ff610b5872245b0294699b8076a27f56 (diff) | |
| download | gnutls-3d1c141575c1c58789aff5b38ec5dd6b479d6564.tar.gz | |
header size is now written in gnutls_cipher.c
Diffstat (limited to 'lib/gnutls_cipher.c')
| -rw-r--r-- | lib/gnutls_cipher.c | 30 |
1 files changed, 18 insertions, 12 deletions
diff --git a/lib/gnutls_cipher.c b/lib/gnutls_cipher.c index 3e5e7c1af7..148bacf380 100644 --- a/lib/gnutls_cipher.c +++ b/lib/gnutls_cipher.c @@ -33,10 +33,12 @@ #include "gnutls_record.h" #include "gnutls_constate.h" -/* returns ciphertext which contains RECORD_HEADER_SIZE unused bytes +/* returns ciphertext which contains the headers too. This also + * calculates the size in the header field. */ -int _gnutls_encrypt(GNUTLS_STATE state, const char *data, size_t data_size, - uint8 ** ciphertext, ContentType type) +int _gnutls_encrypt(GNUTLS_STATE state, const char* headers, int headers_size, + const char *data, size_t data_size, + uint8 ** ciphertext, ContentType type) { gnutls_datum plain = { (char*)data, data_size }; gnutls_datum comp, ciph; @@ -51,7 +53,7 @@ int _gnutls_encrypt(GNUTLS_STATE state, const char *data, size_t data_size, return err; } - err = _gnutls_compressed2TLSCiphertext(state, &ciph, comp, type); + err = _gnutls_compressed2TLSCiphertext(state, &ciph, comp, type, headers_size); if (err < 0) { gnutls_assert(); return err; @@ -59,6 +61,10 @@ int _gnutls_encrypt(GNUTLS_STATE state, const char *data, size_t data_size, gnutls_free_datum(&comp); + /* copy the headers */ + memcpy( ciph.data, headers, headers_size); + WRITEuint16( ciph.size - headers_size, &ciph.data[3]); + *ciphertext = ciph.data; return ciph.size; @@ -109,7 +115,7 @@ int _gnutls_decrypt(GNUTLS_STATE state, char *ciphertext, int _gnutls_compressed2TLSCiphertext(GNUTLS_STATE state, gnutls_datum* cipher, - gnutls_datum compressed, ContentType _type) + gnutls_datum compressed, ContentType _type, int headers_size) { uint8 MAC[MAX_HASH_SIZE]; uint16 c_length; @@ -177,7 +183,7 @@ int _gnutls_compressed2TLSCiphertext(GNUTLS_STATE state, length = compressed.size + hash_size; - data = gnutls_malloc(length+RECORD_HEADER_SIZE); + data = gnutls_malloc(length+headers_size); if (data==NULL) { gnutls_assert(); return GNUTLS_E_MEMORY_ERROR; @@ -208,12 +214,12 @@ int _gnutls_compressed2TLSCiphertext(GNUTLS_STATE state, pad = (uint8) (blocksize - (length % blocksize)) + rand; length += pad; - data = gnutls_malloc(length+RECORD_HEADER_SIZE); + data = gnutls_malloc(length+headers_size); if (data==NULL) { gnutls_assert(); return GNUTLS_E_MEMORY_ERROR; } - memset(&data[RECORD_HEADER_SIZE + length - pad], pad - 1, pad); + memset(&data[headers_size + length - pad], pad - 1, pad); break; default: @@ -221,14 +227,14 @@ int _gnutls_compressed2TLSCiphertext(GNUTLS_STATE state, return GNUTLS_E_UNKNOWN_CIPHER_TYPE; } - memcpy(&data[RECORD_HEADER_SIZE], compressed.data, compressed.size); - memcpy(&data[compressed.size+RECORD_HEADER_SIZE], MAC, hash_size); + memcpy(&data[headers_size], compressed.data, compressed.size); + memcpy(&data[compressed.size+headers_size], MAC, hash_size); gnutls_cipher_encrypt(state->connection_state. - write_cipher_state, &data[RECORD_HEADER_SIZE], + write_cipher_state, &data[headers_size], length); cipher->data = data; - cipher->size = length + RECORD_HEADER_SIZE; + cipher->size = length + headers_size; return 0; } |