mirrors/libsodium
2
0
Fork 0
mirror of https://github.com/jedisct1/libsodium.git synced 2026-09-25 04:09:58 +03:00
Code Issues Packages Projects Releases Wiki Activity

Relax crypto_auth_hmacsha{256,512}_init to accept NULL pointers

Browse Source
This commit is contained in:
Frank Denis
2026-03-15 13:06:59 +01:00
parent 51d4fb7637
commit fc98842884
4 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libsodium/crypto_auth/hmacsha256/auth_hmacsha256.c
+5
View File
@@ -3,6 +3,7 @@
#include <stdint.h> #include <stdint.h>
#include <string.h> #include <string.h>
#include "core.h"
#include "crypto_auth_hmacsha256.h" #include "crypto_auth_hmacsha256.h"
#include "crypto_hash_sha256.h" #include "crypto_hash_sha256.h"
#include "crypto_verify_32.h" #include "crypto_verify_32.h"
@@ -47,6 +48,10 @@ crypto_auth_hmacsha256_init(crypto_auth_hmacsha256_state *state,
crypto_hash_sha256_final(&state->ictx, khash); crypto_hash_sha256_final(&state->ictx, khash);
key = khash; key = khash;
keylen = 32; keylen = 32;
} else if (key == NULL) {
if (keylen > 0) {
sodium_misuse();
}
} }
crypto_hash_sha256_init(&state->ictx); crypto_hash_sha256_init(&state->ictx);
memset(pad, 0x36, 64); memset(pad, 0x36, 64);
src/libsodium/crypto_auth/hmacsha512/auth_hmacsha512.c
+5
View File
@@ -3,6 +3,7 @@
#include <stdint.h> #include <stdint.h>
#include <string.h> #include <string.h>
#include "core.h"
#include "crypto_auth_hmacsha512.h" #include "crypto_auth_hmacsha512.h"
#include "crypto_hash_sha512.h" #include "crypto_hash_sha512.h"
#include "crypto_verify_64.h" #include "crypto_verify_64.h"
@@ -47,6 +48,10 @@ crypto_auth_hmacsha512_init(crypto_auth_hmacsha512_state *state,
crypto_hash_sha512_final(&state->ictx, khash); crypto_hash_sha512_final(&state->ictx, khash);
key = khash; key = khash;
keylen = 64; keylen = 64;
} else if (key == NULL) {
if (keylen > 0) {
sodium_misuse();
}
} }
crypto_hash_sha512_init(&state->ictx); crypto_hash_sha512_init(&state->ictx);
memset(pad, 0x36, 128); memset(pad, 0x36, 128);
src/libsodium/include/sodium/crypto_auth_hmacsha256.h
+1 -1
View File
@@ -46,7 +46,7 @@ size_t crypto_auth_hmacsha256_statebytes(void);
SODIUM_EXPORT SODIUM_EXPORT
int crypto_auth_hmacsha256_init(crypto_auth_hmacsha256_state *state, int crypto_auth_hmacsha256_init(crypto_auth_hmacsha256_state *state,
const unsigned char *key, const unsigned char *key,
size_t keylen) __attribute__ ((nonnull)); size_t keylen) __attribute__ ((nonnull(1)));
SODIUM_EXPORT SODIUM_EXPORT
int crypto_auth_hmacsha256_update(crypto_auth_hmacsha256_state *state, int crypto_auth_hmacsha256_update(crypto_auth_hmacsha256_state *state,
src/libsodium/include/sodium/crypto_auth_hmacsha512.h
+1 -1
View File
@@ -46,7 +46,7 @@ size_t crypto_auth_hmacsha512_statebytes(void);
SODIUM_EXPORT SODIUM_EXPORT
int crypto_auth_hmacsha512_init(crypto_auth_hmacsha512_state *state, int crypto_auth_hmacsha512_init(crypto_auth_hmacsha512_state *state,
const unsigned char *key, const unsigned char *key,
size_t keylen) __attribute__ ((nonnull)); size_t keylen) __attribute__ ((nonnull(1)));
SODIUM_EXPORT SODIUM_EXPORT
int crypto_auth_hmacsha512_update(crypto_auth_hmacsha512_state *state, int crypto_auth_hmacsha512_update(crypto_auth_hmacsha512_state *state,