diff options
author | Miloslav Trmač <mitr@redhat.com> | 2010-08-25 05:47:28 +0200 |
---|---|---|
committer | Miloslav Trmač <mitr@redhat.com> | 2010-08-25 05:47:28 +0200 |
commit | 7f6e65351ae2c214f28496609103711773721ca5 (patch) | |
tree | 29c1ce2f7f8c149700bb13c4b8dbf06723dc4ab8 /cryptodev_cipher.c | |
parent | fb5c4437fbec88cd98074a0d76ce939de2cc530f (diff) | |
parent | d2e5c1885639377eb06a03a852d05faf06b4a3c1 (diff) | |
download | cryptodev-linux-7f6e65351ae2c214f28496609103711773721ca5.tar.gz cryptodev-linux-7f6e65351ae2c214f28496609103711773721ca5.tar.xz cryptodev-linux-7f6e65351ae2c214f28496609103711773721ca5.zip |
Merge branch 'cleanups'
Diffstat (limited to 'cryptodev_cipher.c')
-rw-r--r-- | cryptodev_cipher.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cryptodev_cipher.c b/cryptodev_cipher.c index 4e74fcc..dae4a63 100644 --- a/cryptodev_cipher.c +++ b/cryptodev_cipher.c @@ -216,7 +216,7 @@ ssize_t cryptodev_cipher_decrypt( struct cipher_data* cdata, const struct scatte /* Hash functions */ -int cryptodev_hash_init( struct hash_data* hdata, const char* alg_name, int hmac_mode, void * mackey, size_t mackeylen) +int cryptodev_hash_init(struct hash_data *hdata, const char *alg_name, const void *mackey, size_t mackeylen) { int ret; @@ -228,7 +228,7 @@ int ret; } /* Copy the key from user and set to TFM. */ - if (hmac_mode != 0) { + if (mackey != NULL) { ret = crypto_ahash_setkey(hdata->async.s, mackey, mackeylen); if (unlikely(ret)) { |