diff options
| author | Miloslav Trmač <mitr@redhat.com> | 2010-08-18 05:57:27 +0200 |
|---|---|---|
| committer | Miloslav Trmač <mitr@redhat.com> | 2010-08-25 00:05:19 +0200 |
| commit | 718c0c3aa5cf871a7d69d5f440c9d668fac0ddf0 (patch) | |
| tree | d2249106988c76c499acf0d991af6d9254f311da /examples | |
| parent | f9fa90899a4691ce01244593e2902111fe9bf2c6 (diff) | |
| download | cryptodev-linux-718c0c3aa5cf871a7d69d5f440c9d668fac0ddf0.tar.gz cryptodev-linux-718c0c3aa5cf871a7d69d5f440c9d668fac0ddf0.tar.xz cryptodev-linux-718c0c3aa5cf871a7d69d5f440c9d668fac0ddf0.zip | |
Replace ncr_wrap_algorithm_t by NLA_NUL_STRING
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/ncr.c | 12 | ||||
| -rw-r--r-- | examples/pk.c | 10 |
2 files changed, 11 insertions, 11 deletions
diff --git a/examples/ncr.c b/examples/ncr.c index a9b0cea..343208e 100644 --- a/examples/ncr.c +++ b/examples/ncr.c @@ -369,12 +369,12 @@ test_ncr_wrap_key(int cfd) struct __attribute__((packed)) { struct ncr_key_wrap f; struct nlattr algo_head ALIGN_NL; - uint32_t algo ALIGN_NL; + char algo[sizeof(NCR_WALG_AES_RFC3394)] ALIGN_NL; } kwrap; struct __attribute__((packed)) { struct ncr_key_unwrap f; struct nlattr wrap_algo_head ALIGN_NL; - uint32_t wrap_algo ALIGN_NL; + char wrap_algo[sizeof(NCR_WALG_AES_RFC3394)] ALIGN_NL; struct nlattr algo_head ALIGN_NL; char algo[sizeof(ALG_AES_CBC)] ALIGN_NL; } kunwrap; @@ -464,7 +464,7 @@ test_ncr_wrap_key(int cfd) kwrap.f.buffer_size = sizeof(data); kwrap.algo_head.nla_len = NLA_HDRLEN + sizeof(kwrap.algo); kwrap.algo_head.nla_type = NCR_ATTR_WRAPPING_ALGORITHM; - kwrap.algo = NCR_WALG_AES_RFC3394; + strcpy(kwrap.algo, NCR_WALG_AES_RFC3394); data_size = ioctl(cfd, NCRIO_KEY_WRAP, &kwrap); if (geteuid() == 0 && data_size < 0) { @@ -513,7 +513,7 @@ test_ncr_wrap_key(int cfd) kunwrap.f.data_size = data_size; kunwrap.wrap_algo_head.nla_len = NLA_HDRLEN + sizeof(kunwrap.wrap_algo); kunwrap.wrap_algo_head.nla_type = NCR_ATTR_WRAPPING_ALGORITHM; - kunwrap.wrap_algo = NCR_WALG_AES_RFC3394; + strcpy(kunwrap.wrap_algo, NCR_WALG_AES_RFC3394); kunwrap.algo_head.nla_len = NLA_HDRLEN + sizeof(kunwrap.algo); kunwrap.algo_head.nla_type = NCR_ATTR_ALGORITHM; strcpy(kunwrap.algo, ALG_AES_CBC); @@ -579,7 +579,7 @@ test_ncr_wrap_key2(int cfd) struct __attribute__((packed)) { struct ncr_key_wrap f; struct nlattr algo_head ALIGN_NL; - uint32_t algo ALIGN_NL; + char algo[sizeof(NCR_WALG_AES_RFC3394)] ALIGN_NL; } kwrap; uint8_t data[WRAPPED_KEY_DATA_SIZE]; @@ -667,7 +667,7 @@ test_ncr_wrap_key2(int cfd) kwrap.f.buffer_size = sizeof(data); kwrap.algo_head.nla_len = NLA_HDRLEN + sizeof(kwrap.algo); kwrap.algo_head.nla_type = NCR_ATTR_WRAPPING_ALGORITHM; - kwrap.algo = NCR_WALG_AES_RFC3394; + strcpy(kwrap.algo, NCR_WALG_AES_RFC3394); ret = ioctl(cfd, NCRIO_KEY_WRAP, &kwrap); if (ret < 0) { diff --git a/examples/pk.c b/examples/pk.c index 599f396..1db7aaf 100644 --- a/examples/pk.c +++ b/examples/pk.c @@ -618,12 +618,12 @@ test_ncr_wrap_key3(int cfd) struct __attribute__((packed)) { struct ncr_key_wrap f; struct nlattr algo_head ALIGN_NL; - uint32_t algo ALIGN_NL; + char algo[sizeof(NCR_WALG_AES_RFC5649)] ALIGN_NL; } kwrap; struct __attribute__((packed)) { struct ncr_key_unwrap f; struct nlattr wrap_algo_head ALIGN_NL; - uint32_t wrap_algo ALIGN_NL; + char wrap_algo[sizeof(NCR_WALG_AES_RFC5649)] ALIGN_NL; struct nlattr algo_head ALIGN_NL; char algo[sizeof(ALG_RSA)] ALIGN_NL; } kunwrap; @@ -731,7 +731,7 @@ test_ncr_wrap_key3(int cfd) kwrap.f.buffer_size = sizeof(data); kwrap.algo_head.nla_len = NLA_HDRLEN + sizeof(kwrap.algo); kwrap.algo_head.nla_type = NCR_ATTR_WRAPPING_ALGORITHM; - kwrap.algo = NCR_WALG_AES_RFC5649; + strcpy(kwrap.algo, NCR_WALG_AES_RFC5649); ret = ioctl(cfd, NCRIO_KEY_WRAP, &kwrap); if (ret < 0) { @@ -749,7 +749,7 @@ test_ncr_wrap_key3(int cfd) kwrap.f.buffer_size = sizeof(data); kwrap.algo_head.nla_len = NLA_HDRLEN + sizeof(kwrap.algo); kwrap.algo_head.nla_type = NCR_ATTR_WRAPPING_ALGORITHM; - kwrap.algo = NCR_WALG_AES_RFC5649; + strcpy(kwrap.algo, NCR_WALG_AES_RFC5649); ret = ioctl(cfd, NCRIO_KEY_WRAP, &kwrap); if (ret < 0 && i != 2) { @@ -776,7 +776,7 @@ test_ncr_wrap_key3(int cfd) = NLA_HDRLEN + sizeof(kunwrap.wrap_algo); kunwrap.wrap_algo_head.nla_type = NCR_ATTR_WRAPPING_ALGORITHM; - kunwrap.wrap_algo = NCR_WALG_AES_RFC5649; + strcpy(kunwrap.wrap_algo, NCR_WALG_AES_RFC5649); kunwrap.algo_head.nla_len = NLA_HDRLEN + sizeof(kunwrap.algo); kunwrap.algo_head.nla_type = NCR_ATTR_ALGORITHM; |