diff options
| -rw-r--r-- | commands/digest.c | 3 | ||||
| -rw-r--r-- | crypto/hmac.c | 1 | ||||
| -rw-r--r-- | include/digest.h | 12 |
3 files changed, 16 insertions, 0 deletions
diff --git a/commands/digest.c b/commands/digest.c index ef95e94816..b6bce88297 100644 --- a/commands/digest.c +++ b/commands/digest.c @@ -34,6 +34,9 @@ int __do_digest(struct digest *d, unsigned char *key, int keylen, perror("set_key"); goto err; } + } else if (digest_is_flags(d, DIGEST_ALGO_NEED_KEY)) { + eprintf("%s need a key to be used\n", digest_name(d)); + goto err; } hash = calloc(digest_length(d), sizeof(unsigned char)); diff --git a/crypto/hmac.c b/crypto/hmac.c index c2195d972e..4c6a703e5e 100644 --- a/crypto/hmac.c +++ b/crypto/hmac.c @@ -145,6 +145,7 @@ err: } struct digest_algo hmac_algo = { + .flags = DIGEST_ALGO_NEED_KEY, .alloc = digest_hmac_alloc, .init = digest_hmac_init, .update = digest_hmac_update, diff --git a/include/digest.h b/include/digest.h index cb579ee03d..85c4da36f5 100644 --- a/include/digest.h +++ b/include/digest.h @@ -25,6 +25,8 @@ struct digest; struct digest_algo { char *name; +#define DIGEST_ALGO_NEED_KEY (1 << 0) + unsigned int flags; int (*alloc)(struct digest *d); void (*free)(struct digest *d); @@ -108,4 +110,14 @@ static inline int digest_set_key(struct digest *d, const unsigned char *key, return d->algo->set_key(d, key, len); } +static inline int digest_is_flags(struct digest *d, unsigned int flags) +{ + return d->algo->flags & flags; +} + +static inline const char *digest_name(struct digest *d) +{ + return d->algo->name; +} + #endif /* __SH_ST_DEVICES_H__ */ |