diff options
author | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2010-07-23 08:28:15 +0200 |
---|---|---|
committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2010-07-23 08:28:15 +0200 |
commit | 8243a470ec9a7e2ffea5f70539c468341100aef8 (patch) | |
tree | afa3038213763be835cdd014703968bc98e3e8cd /examples | |
parent | 8383ca063d2473a87e585c20d80138d68d7d4dbf (diff) | |
download | cryptodev-linux-8243a470ec9a7e2ffea5f70539c468341100aef8.tar.gz cryptodev-linux-8243a470ec9a7e2ffea5f70539c468341100aef8.tar.xz cryptodev-linux-8243a470ec9a7e2ffea5f70539c468341100aef8.zip |
Revert "initial support for userspace data."
This reverts commit e7828004e40592c8cffc9235f72440c802905e16.
Diffstat (limited to 'examples')
-rw-r--r-- | examples/ncr.c | 50 | ||||
-rw-r--r-- | examples/pk.c | 11 | ||||
-rw-r--r-- | examples/speed.c | 106 |
3 files changed, 35 insertions, 132 deletions
diff --git a/examples/ncr.c b/examples/ncr.c index d5d3e20..69e699a 100644 --- a/examples/ncr.c +++ b/examples/ncr.c @@ -55,7 +55,6 @@ test_ncr_key(int cfd) dinit.flags = NCR_DATA_FLAG_EXPORTABLE; dinit.initial_data = data; dinit.initial_data_size = sizeof(data); - dinit.type = NCR_DATA_KERNEL; if (ioctl(cfd, NCRIO_DATA_INIT, &dinit)) { fprintf(stderr, "Error: %s:%d\n", __func__, __LINE__); @@ -97,7 +96,6 @@ test_ncr_key(int cfd) dinit.flags = NCR_DATA_FLAG_EXPORTABLE; dinit.initial_data = NULL; dinit.initial_data_size = 0; - dinit.type = NCR_DATA_KERNEL; if (ioctl(cfd, NCRIO_DATA_INIT, &dinit)) { fprintf(stderr, "Error: %s:%d\n", __func__, __LINE__); @@ -116,10 +114,12 @@ test_ncr_key(int cfd) } /* now read data */ - memset(&kdata, 0, sizeof(kdata)); + memset(data, 0, sizeof(data)); + kdata.desc = dinit.desc; kdata.data = data; kdata.data_size = sizeof(data); + kdata.append_flag = 0; if (ioctl(cfd, NCRIO_DATA_GET, &kdata)) { fprintf(stderr, "Error: %s:%d\n", __func__, __LINE__); @@ -129,7 +129,7 @@ test_ncr_key(int cfd) if (memcmp(data, data_bak, sizeof(data))!=0) { fprintf(stderr, "Error: %s:%d\n", __func__, __LINE__); - fprintf(stderr, "data returned but differ (%d, %d)!\n", (int)kdata.data_size, sizeof(data)); + fprintf(stderr, "data returned but differ!\n"); return 1; } @@ -179,6 +179,7 @@ test_ncr_key(int cfd) kdata.desc = dinit.desc; kdata.data = data; kdata.data_size = sizeof(data); + kdata.append_flag = 0; if (ioctl(cfd, NCRIO_DATA_GET, &kdata)) { fprintf(stderr, "Error: %s:%d\n", __func__, __LINE__); @@ -236,6 +237,7 @@ test_ncr_key(int cfd) kdata.desc = dinit.desc; kdata.data = data; kdata.data_size = sizeof(data); + kdata.append_flag = 0; if (ioctl(cfd, NCRIO_DATA_GET, &kdata)==0) { fprintf(stderr, "Error: %s:%d\n", __func__, __LINE__); @@ -270,7 +272,6 @@ static int test_ncr_data(int cfd) init.flags = NCR_DATA_FLAG_EXPORTABLE; init.initial_data = data; init.initial_data_size = sizeof(data); - init.type = NCR_DATA_KERNEL; if (ioctl(cfd, NCRIO_DATA_INIT, &init)) { perror("ioctl(NCRIO_DATA_INIT)"); @@ -284,6 +285,7 @@ static int test_ncr_data(int cfd) kdata.desc = init.desc; kdata.data = data; kdata.data_size = sizeof(data); + kdata.append_flag = 0; if (ioctl(cfd, NCRIO_DATA_GET, &kdata)) { perror("ioctl(NCRIO_DATA_GET)"); @@ -303,6 +305,7 @@ static int test_ncr_data(int cfd) kdata.desc = init.desc; kdata.data = data; kdata.data_size = sizeof(data); + kdata.append_flag = 0; if (ioctl(cfd, NCRIO_DATA_SET, &kdata)) { perror("ioctl(NCRIO_DATA_SET)"); @@ -315,6 +318,7 @@ static int test_ncr_data(int cfd) kdata.desc = init.desc; kdata.data = data; kdata.data_size = sizeof(data); + kdata.append_flag = 0; if (ioctl(cfd, NCRIO_DATA_GET, &kdata)) { perror("ioctl(NCRIO_DATA_GET)"); @@ -341,7 +345,6 @@ static int test_ncr_data(int cfd) init.flags = 0; init.initial_data = data; init.initial_data_size = sizeof(data); - init.type = NCR_DATA_KERNEL; if (ioctl(cfd, NCRIO_DATA_INIT, &init)) { perror("ioctl(NCRIO_DATA_INIT)"); @@ -351,6 +354,7 @@ static int test_ncr_data(int cfd) kdata.desc = init.desc; kdata.data = data; kdata.data_size = sizeof(data); + kdata.append_flag = 0; if (ioctl(cfd, NCRIO_DATA_GET, &kdata)==0) { fprintf(stderr, "Unexportable data were exported!?\n"); @@ -363,7 +367,6 @@ static int test_ncr_data(int cfd) init.flags = 0; init.initial_data = data; init.initial_data_size = sizeof(data); - init.type = NCR_DATA_KERNEL; if (ioctl(cfd, NCRIO_DATA_INIT, &init)) { //fprintf(stderr, "Reached maximum limit at: %d data items\n", i); @@ -401,7 +404,6 @@ test_ncr_wrap_key(int cfd) dinit.flags = NCR_DATA_FLAG_EXPORTABLE; dinit.initial_data = "\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0A\x0B\x0C\x0D\x0E\x0F"; dinit.initial_data_size = 16; - dinit.type = NCR_DATA_KERNEL; if (ioctl(cfd, NCRIO_DATA_INIT, &dinit)) { fprintf(stderr, "Error: %s:%d\n", __func__, __LINE__); @@ -436,10 +438,11 @@ test_ncr_wrap_key(int cfd) kdata.data = DKEY; kdata.data_size = 16; kdata.desc = dinit.desc; + kdata.append_flag = 0; if (ioctl(cfd, NCRIO_DATA_SET, &kdata)) { fprintf(stderr, "Error: %s:%d\n", __func__, __LINE__); - perror("ioctl(NCRIO_DATA_SET)"); + perror("ioctl(NCRIO_DATA_INIT)"); return 1; } @@ -480,6 +483,7 @@ test_ncr_wrap_key(int cfd) kdata.data = data; kdata.data_size = sizeof(data); + kdata.append_flag = 0; if (ioctl(cfd, NCRIO_DATA_GET, &kdata)) { fprintf(stderr, "Error: %s:%d\n", __func__, __LINE__); @@ -585,7 +589,6 @@ test_ncr_store_wrap_key(int cfd) memset(&dinit, 0, sizeof(dinit)); dinit.max_object_size = DATA_SIZE; dinit.flags = NCR_DATA_FLAG_EXPORTABLE; - dinit.type = NCR_DATA_KERNEL; if (ioctl(cfd, NCRIO_DATA_INIT, &dinit)) { fprintf(stderr, "Error: %s:%d\n", __func__, __LINE__); @@ -600,10 +603,11 @@ test_ncr_store_wrap_key(int cfd) kdata.data = DKEY; kdata.data_size = 16; kdata.desc = dd; + kdata.append_flag = 0; if (ioctl(cfd, NCRIO_DATA_SET, &kdata)) { fprintf(stderr, "Error: %s:%d\n", __func__, __LINE__); - perror("ioctl(NCRIO_DATA_SET)"); + perror("ioctl(NCRIO_DATA_INIT)"); return 1; } @@ -746,7 +750,6 @@ test_ncr_aes(int cfd) dinit.flags = NCR_DATA_FLAG_EXPORTABLE; dinit.initial_data = NULL; dinit.initial_data_size = 0; - dinit.type = NCR_DATA_KERNEL; if (ioctl(cfd, NCRIO_DATA_INIT, &dinit)) { fprintf(stderr, "Error: %s:%d\n", __func__, __LINE__); @@ -785,10 +788,11 @@ test_ncr_aes(int cfd) kdata.data = (void*)aes_vectors[i].key; kdata.data_size = 16; kdata.desc = dd; + kdata.append_flag = 0; if (ioctl(cfd, NCRIO_DATA_SET, &kdata)) { fprintf(stderr, "Error: %s:%d\n", __func__, __LINE__); - perror("ioctl(NCRIO_DATA_SET)"); + perror("ioctl(NCRIO_DATA_INIT)"); return 1; } @@ -804,10 +808,11 @@ test_ncr_aes(int cfd) kdata.data = (void*)aes_vectors[i].plaintext; kdata.data_size = 16; kdata.desc = dd; + kdata.append_flag = 0; if (ioctl(cfd, NCRIO_DATA_SET, &kdata)) { fprintf(stderr, "Error: %s:%d\n", __func__, __LINE__); - perror("ioctl(NCRIO_DATA_SET)"); + perror("ioctl(NCRIO_DATA_INIT)"); return 1; } @@ -829,6 +834,7 @@ test_ncr_aes(int cfd) kdata.desc = dd2; kdata.data = data; kdata.data_size = sizeof(data); + kdata.append_flag = 0; if (ioctl(cfd, NCRIO_DATA_GET, &kdata)) { fprintf(stderr, "Error: %s:%d\n", __func__, __LINE__); @@ -859,10 +865,11 @@ test_ncr_aes(int cfd) kdata.data = (void*)aes_vectors[i].key; kdata.data_size = 16; kdata.desc = dd; + kdata.append_flag = 0; if (ioctl(cfd, NCRIO_DATA_SET, &kdata)) { fprintf(stderr, "Error: %s:%d\n", __func__, __LINE__); - perror("ioctl(NCRIO_DATA_SET)"); + perror("ioctl(NCRIO_DATA_INIT)"); return 1; } @@ -879,10 +886,11 @@ test_ncr_aes(int cfd) kdata.data = (void*)aes_vectors[i].ciphertext; kdata.data_size = 16; kdata.desc = dd; + kdata.append_flag = 0; if (ioctl(cfd, NCRIO_DATA_SET, &kdata)) { fprintf(stderr, "Error: %s:%d\n", __func__, __LINE__); - perror("ioctl(NCRIO_DATA_SET)"); + perror("ioctl(NCRIO_DATA_INIT)"); return 1; } @@ -904,6 +912,7 @@ test_ncr_aes(int cfd) kdata.desc = dd2; kdata.data = data; kdata.data_size = sizeof(data); + kdata.append_flag = 0; if (ioctl(cfd, NCRIO_DATA_GET, &kdata)) { fprintf(stderr, "Error: %s:%d\n", __func__, __LINE__); @@ -1032,7 +1041,6 @@ test_ncr_hash(int cfd) dinit.flags = NCR_DATA_FLAG_EXPORTABLE; dinit.initial_data = NULL; dinit.initial_data_size = 0; - dinit.type = NCR_DATA_KERNEL; if (ioctl(cfd, NCRIO_DATA_INIT, &dinit)) { fprintf(stderr, "Error: %s:%d\n", __func__, __LINE__); @@ -1073,10 +1081,11 @@ test_ncr_hash(int cfd) kdata.data = (void*)hash_vectors[i].key; kdata.data_size = hash_vectors[i].key_size; kdata.desc = dd; + kdata.append_flag = 0; if (ioctl(cfd, NCRIO_DATA_SET, &kdata)) { fprintf(stderr, "Error: %s:%d\n", __func__, __LINE__); - perror("ioctl(NCRIO_DATA_SET)"); + perror("ioctl(NCRIO_DATA_INIT)"); return 1; } @@ -1093,10 +1102,11 @@ test_ncr_hash(int cfd) kdata.data = (void*)hash_vectors[i].plaintext; kdata.data_size = hash_vectors[i].plaintext_size; kdata.desc = dd; + kdata.append_flag = 0; if (ioctl(cfd, NCRIO_DATA_SET, &kdata)) { fprintf(stderr, "Error: %s:%d\n", __func__, __LINE__); - perror("ioctl(NCRIO_DATA_SET)"); + perror("ioctl(NCRIO_DATA_INIT)"); return 1; } @@ -1116,10 +1126,10 @@ test_ncr_hash(int cfd) } /* verify */ - memset(&kdata, 0, sizeof(kdata)); kdata.desc = dd2; kdata.data = data; kdata.data_size = sizeof(data); + kdata.append_flag = 0; if (ioctl(cfd, NCRIO_DATA_GET, &kdata)) { fprintf(stderr, "Error: %s:%d\n", __func__, __LINE__); diff --git a/examples/pk.c b/examples/pk.c index edae150..0765638 100644 --- a/examples/pk.c +++ b/examples/pk.c @@ -339,7 +339,6 @@ static int rsa_key_encrypt(int cfd, ncr_key_t privkey, ncr_key_t pubkey, int oae dinit.flags = NCR_DATA_FLAG_EXPORTABLE; dinit.initial_data = data; dinit.initial_data_size = RSA_ENCRYPT_SIZE; - dinit.type = NCR_DATA_KERNEL; if (ioctl(cfd, NCRIO_DATA_INIT, &dinit)) { fprintf(stderr, "Error: %s:%d\n", __func__, __LINE__); @@ -352,7 +351,6 @@ static int rsa_key_encrypt(int cfd, ncr_key_t privkey, ncr_key_t pubkey, int oae memset(&dinit, 0, sizeof(dinit)); dinit.max_object_size = DATA_SIZE; dinit.flags = NCR_DATA_FLAG_EXPORTABLE; - dinit.type = NCR_DATA_KERNEL; if (ioctl(cfd, NCRIO_DATA_INIT, &dinit)) { fprintf(stderr, "Error: %s:%d\n", __func__, __LINE__); @@ -439,7 +437,6 @@ static int rsa_key_sign_verify(int cfd, ncr_key_t privkey, ncr_key_t pubkey, int dinit.flags = NCR_DATA_FLAG_EXPORTABLE; dinit.initial_data = data; dinit.initial_data_size = sizeof(data); - dinit.type = NCR_DATA_KERNEL; if (ioctl(cfd, NCRIO_DATA_INIT, &dinit)) { fprintf(stderr, "Error: %s:%d\n", __func__, __LINE__); @@ -452,7 +449,6 @@ static int rsa_key_sign_verify(int cfd, ncr_key_t privkey, ncr_key_t pubkey, int memset(&dinit, 0, sizeof(dinit)); dinit.max_object_size = DATA_SIZE; dinit.flags = NCR_DATA_FLAG_EXPORTABLE; - dinit.type = NCR_DATA_KERNEL; if (ioctl(cfd, NCRIO_DATA_INIT, &dinit)) { fprintf(stderr, "Error: %s:%d\n", __func__, __LINE__); @@ -533,7 +529,6 @@ static int dsa_key_sign_verify(int cfd, ncr_key_t privkey, ncr_key_t pubkey) memset(&dinit, 0, sizeof(dinit)); dinit.max_object_size = DATA_SIZE; dinit.flags = NCR_DATA_FLAG_EXPORTABLE; - dinit.type = NCR_DATA_KERNEL; if (ioctl(cfd, NCRIO_DATA_INIT, &dinit)) { fprintf(stderr, "Error: %s:%d\n", __func__, __LINE__); @@ -626,7 +621,6 @@ static int test_ncr_rsa(int cfd) dinit.flags = NCR_DATA_FLAG_EXPORTABLE; dinit.initial_data = NULL; dinit.initial_data_size = 0; - dinit.type = NCR_DATA_KERNEL; if (ioctl(cfd, NCRIO_DATA_INIT, &dinit)) { fprintf(stderr, "Error: %s:%d\n", __func__, __LINE__); @@ -650,6 +644,7 @@ static int test_ncr_rsa(int cfd) kdata.desc = dinit.desc; kdata.data = data; kdata.data_size = sizeof(data); + kdata.append_flag = 0; if (ioctl(cfd, NCRIO_DATA_GET, &kdata)) { fprintf(stderr, "Error: %s:%d\n", __func__, __LINE__); @@ -681,6 +676,7 @@ static int test_ncr_rsa(int cfd) kdata.desc = dinit.desc; kdata.data = data; kdata.data_size = sizeof(data); + kdata.append_flag = 0; if (ioctl(cfd, NCRIO_DATA_GET, &kdata)) { fprintf(stderr, "Error: %s:%d\n", __func__, __LINE__); @@ -769,7 +765,6 @@ static int test_ncr_dsa(int cfd) dinit.flags = NCR_DATA_FLAG_EXPORTABLE; dinit.initial_data = NULL; dinit.initial_data_size = 0; - dinit.type = NCR_DATA_KERNEL; if (ioctl(cfd, NCRIO_DATA_INIT, &dinit)) { fprintf(stderr, "Error: %s:%d\n", __func__, __LINE__); @@ -793,6 +788,7 @@ static int test_ncr_dsa(int cfd) kdata.desc = dinit.desc; kdata.data = data; kdata.data_size = sizeof(data); + kdata.append_flag = 0; if (ioctl(cfd, NCRIO_DATA_GET, &kdata)) { fprintf(stderr, "Error: %s:%d\n", __func__, __LINE__); @@ -824,6 +820,7 @@ static int test_ncr_dsa(int cfd) kdata.desc = dinit.desc; kdata.data = data; kdata.data_size = sizeof(data); + kdata.append_flag = 0; if (ioctl(cfd, NCRIO_DATA_GET, &kdata)) { fprintf(stderr, "Error: %s:%d\n", __func__, __LINE__); diff --git a/examples/speed.c b/examples/speed.c index 25bf08b..99dc09e 100644 --- a/examples/speed.c +++ b/examples/speed.c @@ -152,12 +152,10 @@ int encrypt_data_ncr(int cfd, int algo, int chunksize) buffer = malloc(chunksize); memset(iv, 0x23, 32); - memset(&dinit, 0, sizeof(dinit)); dinit.max_object_size = chunksize; dinit.flags = NCR_DATA_FLAG_EXPORTABLE; dinit.initial_data = buffer; dinit.initial_data_size = chunksize; - dinit.type = NCR_DATA_KERNEL; if (ioctl(cfd, NCRIO_DATA_INIT, &dinit)) { fprintf(stderr, "Error: %s:%d\n", __func__, __LINE__); @@ -179,6 +177,7 @@ int encrypt_data_ncr(int cfd, int algo, int chunksize) kdata.data = buffer; kdata.data_size = chunksize; kdata.desc = dd; + kdata.append_flag = 0; if (ioctl(cfd, NCRIO_DATA_SET, &kdata)) { fprintf(stderr, "Error: %s:%d\n", __func__, __LINE__); @@ -218,97 +217,6 @@ int encrypt_data_ncr(int cfd, int algo, int chunksize) return 0; } -int encrypt_data_ncr_user(int cfd, int algo, int chunksize) -{ - char *buffer, iv[32]; - static int val = 23; - struct timeval start, end; - double total = 0; - double secs, ddata, dspeed; - char metric[16]; - ncr_key_t key; - struct ncr_key_generate_st kgen; - struct ncr_data_init_st dinit; - struct ncr_session_once_op_st nop; - ncr_data_t dd; - - if (ioctl(cfd, NCRIO_KEY_INIT, &key)) { - fprintf(stderr, "Error: %s:%d\n", __func__, __LINE__); - perror("ioctl(NCRIO_KEY_INIT)"); - return 1; - } - - kgen.desc = key; - kgen.params.algorithm = NCR_ALG_AES_CBC; - kgen.params.keyflags = NCR_KEY_FLAG_EXPORTABLE; - kgen.params.params.secret.bits = 128; /* 16 bytes */ - - if (ioctl(cfd, NCRIO_KEY_GENERATE, &kgen)) { - fprintf(stderr, "Error: %s:%d\n", __func__, __LINE__); - perror("ioctl(NCRIO_KEY_IMPORT)"); - return 1; - } - - - buffer = malloc(chunksize); - memset(iv, 0x23, 32); - - /* now data are just a mirror of userspace data */ - memset(&dinit, 0, sizeof(dinit)); - dinit.flags = NCR_DATA_FLAG_EXPORTABLE; - dinit.initial_data = buffer; - dinit.initial_data_size = chunksize; - dinit.type = NCR_DATA_USER; - - if (ioctl(cfd, NCRIO_DATA_INIT, &dinit)) { - fprintf(stderr, "Error: %s:%d\n", __func__, __LINE__); - perror("ioctl(NCRIO_DATA_INIT)"); - return 1; - } - dd = dinit.desc; - - printf("\tEncrypting in chunks of %d bytes: ", chunksize); - fflush(stdout); - - memset(buffer, val++, chunksize); - - must_finish = 0; - alarm(5); - - gettimeofday(&start, NULL); - do { - memset(&nop, 0, sizeof(nop)); - nop.init.algorithm = algo; - nop.init.params.key = key; - nop.init.op = NCR_OP_ENCRYPT; - nop.op.data.cipher.plaintext = dd; - nop.op.data.cipher.ciphertext = dd; - - if (ioctl(cfd, NCRIO_SESSION_ONCE, &nop)) { - fprintf(stderr, "Error: %s:%d\n", __func__, __LINE__); - perror("ioctl(NCRIO_SESSION_ONCE)"); - return 1; - } - - total+=chunksize; - } while(must_finish==0); - gettimeofday(&end, NULL); - - if (ioctl(cfd, NCRIO_DATA_DEINIT, &dd)) { - fprintf(stderr, "Error: %s:%d\n", __func__, __LINE__); - perror("ioctl(NCRIO_DATA_INIT)"); - return 1; - } - - secs = udifftimeval(start, end)/ 1000000.0; - - value2human(total, secs, &ddata, &dspeed, metric); - printf ("done. %.2f %s in %.2f secs: ", ddata, metric, secs); - printf ("%.2f %s/sec\n", dspeed, metric); - - return 0; -} - int main(void) { int fd, i, fdc = -1; @@ -369,18 +277,6 @@ int main(void) break; } - fprintf(stderr, "\nTesting NCR-USER with NULL cipher: \n"); - for (i = 256; i <= (64 * 1024); i *= 2) { - if (encrypt_data_ncr_user(fdc, NCR_ALG_NULL, i)) - break; - } - - fprintf(stderr, "\nTesting NCR-USER with AES-128-CBC cipher: \n"); - for (i = 256; i <= (64 * 1024); i *= 2) { - if (encrypt_data_ncr_user(fdc, NCR_ALG_AES_CBC, i)) - break; - } - close(fdc); close(fd); |