diff options
| author | Miloslav Trmač <mitr@redhat.com> | 2010-08-16 16:56:49 +0200 |
|---|---|---|
| committer | Miloslav Trmač <mitr@redhat.com> | 2010-08-24 23:46:25 +0200 |
| commit | 2039b544b32e37bb4aea4ed06ac9ef905f656326 (patch) | |
| tree | 82e17ef30d23f4f2ecffe981e8910e228f7d9512 /examples | |
| parent | 96ec7e16575010e4d48c47ade593ca91690c105b (diff) | |
| download | cryptodev-linux-2039b544b32e37bb4aea4ed06ac9ef905f656326.tar.gz cryptodev-linux-2039b544b32e37bb4aea4ed06ac9ef905f656326.tar.xz cryptodev-linux-2039b544b32e37bb4aea4ed06ac9ef905f656326.zip | |
Convert *_KEY_STORAGE_WRAP
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/ncr.c | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/examples/ncr.c b/examples/ncr.c index d4af05d..52cc9ed 100644 --- a/examples/ncr.c +++ b/examples/ncr.c @@ -680,7 +680,8 @@ test_ncr_store_wrap_key(int cfd) uint32_t flags ALIGN_NL; } kimport; struct ncr_key_export kexport; - struct ncr_key_storage_wrap_st kwrap; + struct ncr_key_storage_wrap kwrap; + struct ncr_key_storage_wrap_st kunwrap; uint8_t data[DATA_SIZE]; int data_size; @@ -727,18 +728,18 @@ test_ncr_store_wrap_key(int cfd) /* now try wrapping key2 using key */ memset(&kwrap, 0, sizeof(kwrap)); - kwrap.keytowrap = key2; - kwrap.io = data; - kwrap.io_size = sizeof(data); + kwrap.key = key2; + kwrap.buffer = data; + kwrap.buffer_size = sizeof(data); - if (ioctl(cfd, NCRIO_KEY_STORAGE_WRAP, &kwrap)) { + data_size = ioctl(cfd, NCRIO_KEY_STORAGE_WRAP, &kwrap); + if (data_size < 0) { fprintf(stderr, "Error: %s:%d\n", __func__, __LINE__); perror("ioctl(NCRIO_KEY_STORAGE_WRAP)"); return 1; } /* test unwrapping */ - data_size = kwrap.io_size; fprintf(stdout, "\tKey Storage Unwrap test...\n"); /* reset key2 */ @@ -755,12 +756,12 @@ test_ncr_store_wrap_key(int cfd) return 1; } - memset(&kwrap, 0, sizeof(kwrap)); - kwrap.keytowrap = key2; - kwrap.io = data; - kwrap.io_size = data_size; + memset(&kunwrap, 0, sizeof(kunwrap)); + kunwrap.keytowrap = key2; + kunwrap.io = data; + kunwrap.io_size = data_size; - if (ioctl(cfd, NCRIO_KEY_STORAGE_UNWRAP, &kwrap)) { + if (ioctl(cfd, NCRIO_KEY_STORAGE_UNWRAP, &kunwrap)) { fprintf(stderr, "Error: %s:%d\n", __func__, __LINE__); perror("ioctl(NCRIO_KEY_STORAGE_UNWRAP)"); return 1; |