diff options
| author | Miloslav Trmač <mitr@redhat.com> | 2010-11-02 20:12:05 +0100 |
|---|---|---|
| committer | Miloslav Trmač <mitr@redhat.com> | 2010-11-02 20:12:05 +0100 |
| commit | bd08fece6e5c509dc22588c93303b067c6900b56 (patch) | |
| tree | b5554704b3c1b48915256fb48112871da87d3160 /tests/symm_ciphers.c | |
| parent | e6b6e8785e16f1c824fd1f1f333ef2591f6f0a10 (diff) | |
| parent | 278a10d4af56af2af8fcb4aa81f492db6109ef58 (diff) | |
| download | ncrypto-bd08fece6e5c509dc22588c93303b067c6900b56.tar.gz ncrypto-bd08fece6e5c509dc22588c93303b067c6900b56.tar.xz ncrypto-bd08fece6e5c509dc22588c93303b067c6900b56.zip | |
Merge branch 'local'
Diffstat (limited to 'tests/symm_ciphers.c')
| -rw-r--r-- | tests/symm_ciphers.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/tests/symm_ciphers.c b/tests/symm_ciphers.c index 1995eeb..27a9752 100644 --- a/tests/symm_ciphers.c +++ b/tests/symm_ciphers.c @@ -26,6 +26,7 @@ POSSIBILITY OF SUCH DAMAGE. Red Hat author: Miloslav Trmač <mitr@redhat.com> */ #include <assert.h> +#include <stdbool.h> #include <stdint.h> #include <stdlib.h> #include <string.h> @@ -48,7 +49,6 @@ struct tv size_t output_size; }; -/* FIXME: Test CBC_PAD as well. */ static const struct tv tvs[] = { #define TV(M, GM, K, KEY, IV, IN, OUT) \ @@ -110,7 +110,7 @@ main (void) res = ncr_symm_cipher_alloc (&sess, tvs[i].mech); assert (res == CKR_OK); - res = ncr_symm_key_create (&key, tvs[i].key_type, tvs[i].key, + res = ncr_symm_key_create (&key, tvs[i].key_type, true, tvs[i].key, tvs[i].key_size); assert (res == CKR_OK); @@ -165,7 +165,7 @@ main (void) res = ncr_symm_cipher_alloc (&sess, tvs[i].mech); assert (res == CKR_OK); - res = ncr_symm_key_create (&key, tvs[i].key_type, tvs[i].key, + res = ncr_symm_key_create (&key, tvs[i].key_type, true, tvs[i].key, tvs[i].key_size); assert (res == CKR_OK); @@ -206,7 +206,8 @@ main (void) res = ncr_symm_cipher_alloc (&sess, tvs[i].mech); assert (res == CKR_OK); - res = ncr_symm_key_generate (&key, tvs[i].key_gen_mech, tvs[i].key_size); + res = ncr_symm_key_generate (&key, tvs[i].key_gen_mech, true, + tvs[i].key_size); assert (res == CKR_OK); for (j = 0; j < 2; j++) @@ -258,7 +259,8 @@ main (void) res = ncr_symm_cipher_alloc (&sess, tvs[i].mech); assert (res == CKR_OK); - res = ncr_symm_key_generate (&key, tvs[i].key_gen_mech, tvs[i].key_size); + res = ncr_symm_key_generate (&key, tvs[i].key_gen_mech, true, + tvs[i].key_size); assert (res == CKR_OK); for (j = 0; j < 2; j++) |