diff options
| author | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2013-03-17 12:16:28 +0100 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2013-03-17 12:16:28 +0100 |
| commit | 32806fd74c926b5886d405d7875d18b9700905fc (patch) | |
| tree | d182657f35906ba5d3d05a794d03c0e19cd88e39 /src/benchmark-cipher.c | |
| parent | 9ff1a5fc7a35266550f78020b6bbe721c5cfe5c1 (diff) | |
| download | gnutls-32806fd74c926b5886d405d7875d18b9700905fc.tar.gz | |
Added salsa20 cipher, and ciphersuites.
Diffstat (limited to 'src/benchmark-cipher.c')
| -rw-r--r-- | src/benchmark-cipher.c | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/src/benchmark-cipher.c b/src/benchmark-cipher.c index b620723a2a..0a4510f86d 100644 --- a/src/benchmark-cipher.c +++ b/src/benchmark-cipher.c @@ -48,7 +48,7 @@ cipher_mac_bench (int algo, int mac_algo, int size) gnutls_hmac_hd_t mac_ctx; void *_key, *_iv; gnutls_datum_t key, iv; - int blocksize = gnutls_cipher_get_block_size (algo); + int ivsize = gnutls_cipher_get_iv_size(algo); int keysize = gnutls_cipher_get_key_size (algo); int step = size*1024; struct benchmark_st st; @@ -58,13 +58,13 @@ cipher_mac_bench (int algo, int mac_algo, int size) return; memset (_key, 0xf0, keysize); - _iv = malloc (blocksize); + _iv = malloc (ivsize); if (_iv == NULL) return; - memset (_iv, 0xf0, blocksize); + memset (_iv, 0xf0, ivsize); iv.data = _iv; - iv.size = blocksize; + iv.size = ivsize; key.data = _key; key.size = keysize; @@ -118,7 +118,7 @@ cipher_bench (int algo, int size, int aead) gnutls_cipher_hd_t ctx; void *_key, *_iv; gnutls_datum_t key, iv; - int blocksize = gnutls_cipher_get_block_size (algo); + int ivsize = gnutls_cipher_get_iv_size(algo); int keysize = gnutls_cipher_get_key_size (algo); int step = size*1024; struct benchmark_st st; @@ -128,14 +128,14 @@ cipher_bench (int algo, int size, int aead) return; memset (_key, 0xf0, keysize); - _iv = malloc (blocksize); + _iv = malloc (ivsize); if (_iv == NULL) return; - memset (_iv, 0xf0, blocksize); + memset (_iv, 0xf0, ivsize); iv.data = _iv; if (aead) iv.size = 12; - else iv.size = blocksize; + else iv.size = ivsize; key.data = _key; key.size = keysize; @@ -212,6 +212,7 @@ void benchmark_cipher (int init, int debug_level) gnutls_rnd( GNUTLS_RND_NONCE, data, sizeof(data)); } + cipher_mac_bench ( GNUTLS_CIPHER_SALSA20R20_128, GNUTLS_MAC_SHA1, 16); cipher_mac_bench ( GNUTLS_CIPHER_AES_128_CBC, GNUTLS_MAC_SHA1, 16); cipher_mac_bench ( GNUTLS_CIPHER_AES_128_CBC, GNUTLS_MAC_SHA256, 16); cipher_bench ( GNUTLS_CIPHER_AES_128_GCM, 16, 1); @@ -226,5 +227,7 @@ void benchmark_cipher (int init, int debug_level) cipher_bench (GNUTLS_CIPHER_ARCFOUR, 16, 0); + cipher_bench ( GNUTLS_CIPHER_SALSA20R20_128, 16, 0); + gnutls_global_deinit(); } |