*/
#include "../system.h"
-#include "../utils.h"
-#include "../xalloc.h"
#include <openssl/err.h>
#include <openssl/hmac.h>
#include "../digest.h"
#include "../logger.h"
-static digest_t *digest_open(const EVP_MD *evp_md, int maclength) {
- digest_t *digest = xzalloc(sizeof(*digest));
+static void digest_open(digest_t *digest, const EVP_MD *evp_md, size_t maclength) {
digest->digest = evp_md;
- int digestlen = EVP_MD_size(digest->digest);
+ size_t digestlen = EVP_MD_size(digest->digest);
- if(maclength > digestlen || maclength < 0) {
+ if(maclength == DIGEST_ALGO_SIZE || maclength > digestlen) {
digest->maclength = digestlen;
} else {
digest->maclength = maclength;
}
-
- return digest;
}
-digest_t *digest_open_by_name(const char *name, int maclength) {
+bool digest_open_by_name(digest_t *digest, const char *name, size_t maclength) {
const EVP_MD *evp_md = EVP_get_digestbyname(name);
if(!evp_md) {
return false;
}
- return digest_open(evp_md, maclength);
+ digest_open(digest, evp_md, maclength);
+ return true;
}
-digest_t *digest_open_by_nid(int nid, int maclength) {
+bool digest_open_by_nid(digest_t *digest, int nid, size_t maclength) {
const EVP_MD *evp_md = EVP_get_digestbynid(nid);
if(!evp_md) {
return false;
}
- return digest_open(evp_md, maclength);
+ digest_open(digest, evp_md, maclength);
+ return true;
}
bool digest_set_key(digest_t *digest, const void *key, size_t len) {
digest->hmac_ctx = HMAC_CTX_new();
- HMAC_Init_ex(digest->hmac_ctx, key, len, digest->digest, NULL);
+ HMAC_Init_ex(digest->hmac_ctx, key, (int)len, digest->digest, NULL);
if(!digest->hmac_ctx) {
abort();
HMAC_CTX_free(digest->hmac_ctx);
}
- free(digest);
+ memset(digest, 0, sizeof(*digest));
}
bool digest_create(digest_t *digest, const void *indata, size_t inlen, void *outdata) {