projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
CI: use explicit Debian release names.
[tinc]
/
src
/
openssl
/
digest.c
diff --git
a/src/openssl/digest.c
b/src/openssl/digest.c
index
d51dcaa
..
82364e7
100644
(file)
--- a/
src/openssl/digest.c
+++ b/
src/openssl/digest.c
@@
-18,7
+18,6
@@
*/
#include "../system.h"
*/
#include "../system.h"
-#include "../utils.h"
#include "../xalloc.h"
#include <openssl/err.h>
#include "../xalloc.h"
#include <openssl/err.h>
@@
-28,13
+27,13
@@
#include "../digest.h"
#include "../logger.h"
#include "../digest.h"
#include "../logger.h"
-static digest_t *digest_open(const EVP_MD *evp_md,
in
t maclength) {
+static digest_t *digest_open(const EVP_MD *evp_md,
size_
t maclength) {
digest_t *digest = xzalloc(sizeof(*digest));
digest->digest = evp_md;
digest_t *digest = xzalloc(sizeof(*digest));
digest->digest = evp_md;
-
in
t 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;
digest->maclength = digestlen;
} else {
digest->maclength = maclength;
@@
-43,7
+42,7
@@
static digest_t *digest_open(const EVP_MD *evp_md, int maclength) {
return digest;
}
return digest;
}
-digest_t *digest_open_by_name(const char *name,
in
t maclength) {
+digest_t *digest_open_by_name(const char *name,
size_
t maclength) {
const EVP_MD *evp_md = EVP_get_digestbyname(name);
if(!evp_md) {
const EVP_MD *evp_md = EVP_get_digestbyname(name);
if(!evp_md) {
@@
-54,7
+53,7
@@
digest_t *digest_open_by_name(const char *name, int maclength) {
return digest_open(evp_md, maclength);
}
return digest_open(evp_md, maclength);
}
-digest_t *digest_open_by_nid(int nid,
in
t maclength) {
+digest_t *digest_open_by_nid(int nid,
size_
t maclength) {
const EVP_MD *evp_md = EVP_get_digestbynid(nid);
if(!evp_md) {
const EVP_MD *evp_md = EVP_get_digestbynid(nid);
if(!evp_md) {
@@
-67,7
+66,7
@@
digest_t *digest_open_by_nid(int nid, int maclength) {
bool digest_set_key(digest_t *digest, const void *key, size_t len) {
digest->hmac_ctx = HMAC_CTX_new();
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();
if(!digest->hmac_ctx) {
abort();