diff options
| author | Miloslav Trmač <mitr@redhat.com> | 2010-07-30 23:21:02 +0200 |
|---|---|---|
| committer | Miloslav Trmač <mitr@redhat.com> | 2010-07-30 23:21:02 +0200 |
| commit | 67d0481e51b198cbad2b1d33389fd80e7a87dd46 (patch) | |
| tree | 91695a45a1f6ffb9e4ab53d6d6b1c34eb3dc25f2 /userspace | |
| parent | 517e0cc6199dcca54f8d20ebb90e304d4cc93c43 (diff) | |
| parent | af51c84e19753ec0c9de368816a30bcc4fb90c24 (diff) | |
| download | cryptodev-linux-67d0481e51b198cbad2b1d33389fd80e7a87dd46.tar.gz cryptodev-linux-67d0481e51b198cbad2b1d33389fd80e7a87dd46.tar.xz cryptodev-linux-67d0481e51b198cbad2b1d33389fd80e7a87dd46.zip | |
Merge branch 'master' into replace-lists
Conflicts:
ncr-int.h
ncr-key.c
ncr.c
Diffstat (limited to 'userspace')
| -rw-r--r-- | userspace/setkey.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/userspace/setkey.c b/userspace/setkey.c index d0a2b62..ea9d30e 100644 --- a/userspace/setkey.c +++ b/userspace/setkey.c @@ -25,6 +25,7 @@ int main(int argc, char** argv) struct ncr_master_key_st key; int size, ret; struct stat st; + uint8_t rawkey[32]; if (argc != 2) { fprintf(stderr, "Usage: setkey [filename]\n"); @@ -52,12 +53,13 @@ int main(int argc, char** argv) exit(1); } - size = fread(key.key, 1, sizeof(key.key), fp); + size = fread(rawkey, 1, sizeof(rawkey), fp); if (size < 16) { fprintf(stderr, "Illegal key!\n"); exit(1); } fclose(fp); + key.key = rawkey; key.key_size = size; /* Open the crypto device */ |