diff options
| author | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2013-07-29 16:22:16 +0200 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2013-07-29 16:22:16 +0200 |
| commit | fc8c2bf60193c9c4d9bc58898fce3d335558daae (patch) | |
| tree | 3ec36df22b6101e4094a86da3422ea5cb301e18b | |
| parent | ab9a13d2e496b6ce04e655afc03b355903f09fc0 (diff) | |
| download | gnutls-fc8c2bf60193c9c4d9bc58898fce3d335558daae.tar.gz | |
corrected overhead calculation in AEAD ciphers.
| -rw-r--r-- | lib/gnutls_dtls.c | 4 | ||||
| -rw-r--r-- | tests/mini-overhead.c | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/lib/gnutls_dtls.c b/lib/gnutls_dtls.c index 754c97277b..009b63cd2d 100644 --- a/lib/gnutls_dtls.c +++ b/lib/gnutls_dtls.c @@ -601,9 +601,7 @@ int t, ret; if (mac->id == GNUTLS_MAC_AEAD) { - t = _gnutls_cipher_get_iv_size(cipher); - total += t; - + total += AEAD_EXPLICIT_DATA_SIZE; total += _gnutls_cipher_get_tag_size(cipher); } else diff --git a/tests/mini-overhead.c b/tests/mini-overhead.c index b4d90f63fd..1802079461 100644 --- a/tests/mini-overhead.c +++ b/tests/mini-overhead.c @@ -348,7 +348,7 @@ doit (void) /* 13 + 20(sha1) + 16(iv) + 16(max pad) */ start("NONE:+VERS-DTLS1.0:+AES-128-CBC:+SHA1:+SIGN-ALL:+COMP-NULL:+RSA", 65); /* 13 + 16(tag) + 4(iv) */ - start("NONE:+VERS-DTLS1.0:+AES-128-GCM:+AEAD:+SIGN-ALL:+COMP-NULL:+RSA", 33); + start("NONE:+VERS-DTLS1.0:+AES-128-GCM:+AEAD:+SIGN-ALL:+COMP-NULL:+RSA", 37); /* 13 + 20(tag) */ start("NONE:+VERS-DTLS1.0:+SALSA20-256:+SHA1:+SIGN-ALL:+COMP-NULL:+RSA", 33); /* 13 + 12(tag) */ |