Commit 0c183a96 authored by Niels Möller's avatar Niels Möller

Use correct block sizes for openssl

ciphers.

Rev: src/nettle/examples/nettle-openssl.c:1.8
parent bf2a410f
...@@ -95,10 +95,7 @@ openssl_aes_decrypt(void *ctx, unsigned length, ...@@ -95,10 +95,7 @@ openssl_aes_decrypt(void *ctx, unsigned length,
const struct nettle_cipher const struct nettle_cipher
nettle_openssl_aes128 = { nettle_openssl_aes128 = {
"openssl aes128", sizeof(AES_KEY), "openssl aes128", sizeof(AES_KEY),
/* Claim no block size, so that the benchmark doesn't try CBC mode 16, 16,
* (as openssl cipher + nettle cbc is somewhat pointless to
* benchmark). */
0, 16,
openssl_aes_set_encrypt_key, openssl_aes_set_decrypt_key, openssl_aes_set_encrypt_key, openssl_aes_set_decrypt_key,
openssl_aes_encrypt, openssl_aes_decrypt openssl_aes_encrypt, openssl_aes_decrypt
}; };
...@@ -109,7 +106,7 @@ nettle_openssl_aes192 = { ...@@ -109,7 +106,7 @@ nettle_openssl_aes192 = {
/* Claim no block size, so that the benchmark doesn't try CBC mode /* Claim no block size, so that the benchmark doesn't try CBC mode
* (as openssl cipher + nettle cbc is somewhat pointless to * (as openssl cipher + nettle cbc is somewhat pointless to
* benchmark). */ * benchmark). */
0, 24, 16, 24,
openssl_aes_set_encrypt_key, openssl_aes_set_decrypt_key, openssl_aes_set_encrypt_key, openssl_aes_set_decrypt_key,
openssl_aes_encrypt, openssl_aes_decrypt openssl_aes_encrypt, openssl_aes_decrypt
}; };
...@@ -120,7 +117,7 @@ nettle_openssl_aes256 = { ...@@ -120,7 +117,7 @@ nettle_openssl_aes256 = {
/* Claim no block size, so that the benchmark doesn't try CBC mode /* Claim no block size, so that the benchmark doesn't try CBC mode
* (as openssl cipher + nettle cbc is somewhat pointless to * (as openssl cipher + nettle cbc is somewhat pointless to
* benchmark). */ * benchmark). */
0, 32, 16, 32,
openssl_aes_set_encrypt_key, openssl_aes_set_decrypt_key, openssl_aes_set_encrypt_key, openssl_aes_set_decrypt_key,
openssl_aes_encrypt, openssl_aes_decrypt openssl_aes_encrypt, openssl_aes_decrypt
}; };
...@@ -188,10 +185,7 @@ openssl_bf_decrypt(void *ctx, unsigned length, ...@@ -188,10 +185,7 @@ openssl_bf_decrypt(void *ctx, unsigned length,
const struct nettle_cipher const struct nettle_cipher
nettle_openssl_blowfish128 = { nettle_openssl_blowfish128 = {
"openssl bf128", sizeof(BF_KEY), "openssl bf128", sizeof(BF_KEY),
/* Claim no block size, so that the benchmark doesn't try CBC mode 8, 16,
* (as openssl cipher + nettle cbc is somewhat pointless to
* benchmark). */
0, 16,
openssl_bf_set_key, openssl_bf_set_key, openssl_bf_set_key, openssl_bf_set_key,
openssl_bf_encrypt, openssl_bf_decrypt openssl_bf_encrypt, openssl_bf_decrypt
}; };
...@@ -242,10 +236,7 @@ openssl_des_decrypt(void *ctx, unsigned length, ...@@ -242,10 +236,7 @@ openssl_des_decrypt(void *ctx, unsigned length,
const struct nettle_cipher const struct nettle_cipher
nettle_openssl_des = { nettle_openssl_des = {
"openssl des", sizeof(DES_key_schedule), "openssl des", sizeof(DES_key_schedule),
/* Claim no block size, so that the benchmark doesn't try CBC mode 8, 8,
* (as openssl cipher + nettle cbc is somewhat pointless to
* benchmark). */
0, 8,
openssl_des_set_key, openssl_des_set_key, openssl_des_set_key, openssl_des_set_key,
openssl_des_encrypt, openssl_des_decrypt openssl_des_encrypt, openssl_des_decrypt
}; };
...@@ -289,10 +280,7 @@ openssl_cast_decrypt(void *ctx, unsigned length, ...@@ -289,10 +280,7 @@ openssl_cast_decrypt(void *ctx, unsigned length,
const struct nettle_cipher const struct nettle_cipher
nettle_openssl_cast128 = { nettle_openssl_cast128 = {
"openssl cast128", sizeof(CAST_KEY), "openssl cast128", sizeof(CAST_KEY),
/* Claim no block size, so that the benchmark doesn't try CBC mode 8, CAST_KEY_LENGTH,
* (as openssl cipher + nettle cbc is somewhat pointless to
* benchmark). */
0, CAST_KEY_LENGTH,
openssl_cast_set_key, openssl_cast_set_key, openssl_cast_set_key, openssl_cast_set_key,
openssl_cast_encrypt, openssl_cast_decrypt openssl_cast_encrypt, openssl_cast_decrypt
}; };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment