shimun/solo
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

allow const data in crypto inputs

Browse Source
This commit is contained in:
Daniel Drown
2020-02-09 21:42:12 -06:00
parent 2ca0ced808
commit 3ed0a60f87
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
fido2/crypto.c
View File

@@ -89,7 +89,7 @@ void crypto_reset_master_secret(void)
} }
void crypto_sha256_update(uint8_t * data, size_t len) void crypto_sha256_update(const uint8_t * data, size_t len)
{ {
sha256_update(&sha256_ctx, data, len); sha256_update(&sha256_ctx, data, len);
} }
@@ -198,7 +198,7 @@ void crypto_ecc256_load_attestation_key(void)
_key_len = 32; _key_len = 32;
} }
void crypto_ecc256_sign(uint8_t * data, int len, uint8_t * sig) void crypto_ecc256_sign(const uint8_t * data, int len, uint8_t * sig)
{ {
if ( uECC_sign(_signing_key, data, len, sig, _es256_curve) == 0) if ( uECC_sign(_signing_key, data, len, sig, _es256_curve) == 0)
{ {
@@ -207,7 +207,7 @@ void crypto_ecc256_sign(uint8_t * data, int len, uint8_t * sig)
} }
} }
void crypto_ecc256_load_key(uint8_t * data, int len, uint8_t * data2, int len2) void crypto_ecc256_load_key(const uint8_t * data, int len, uint8_t * data2, int len2)
{ {
static uint8_t privkey[32]; static uint8_t privkey[32];
generate_private_key(data,len,data2,len2,privkey); generate_private_key(data,len,data2,len2,privkey);
@@ -256,7 +256,7 @@ fail:
} }
void generate_private_key(uint8_t * data, int len, uint8_t * data2, int len2, uint8_t * privkey) void generate_private_key(const uint8_t * data, int len, uint8_t * data2, int len2, uint8_t * privkey)
{ {
crypto_sha256_hmac_init(CRYPTO_MASTER_KEY, 0, privkey); crypto_sha256_hmac_init(CRYPTO_MASTER_KEY, 0, privkey);
crypto_sha256_update(data, len); crypto_sha256_update(data, len);
@@ -270,7 +270,7 @@ void generate_private_key(uint8_t * data, int len, uint8_t * data2, int len2, ui
/*int uECC_compute_public_key(const uint8_t *private_key, uint8_t *public_key, uECC_Curve curve);*/ /*int uECC_compute_public_key(const uint8_t *private_key, uint8_t *public_key, uECC_Curve curve);*/
void crypto_ecc256_derive_public_key(uint8_t * data, int len, uint8_t * x, uint8_t * y) void crypto_ecc256_derive_public_key(const uint8_t * data, int len, uint8_t * x, uint8_t * y)
{ {
uint8_t privkey[32]; uint8_t privkey[32];
uint8_t pubkey[64]; uint8_t pubkey[64];

10
fido2/crypto.h
View File

@@ -10,7 +10,7 @@
#include <stddef.h> #include <stddef.h>
void crypto_sha256_init(); void crypto_sha256_init();
void crypto_sha256_update(uint8_t * data, size_t len); void crypto_sha256_update(const uint8_t * data, size_t len);
void crypto_sha256_update_secret(); void crypto_sha256_update_secret();
void crypto_sha256_final(uint8_t * hash); void crypto_sha256_final(uint8_t * hash);
@@ -22,17 +22,17 @@ void crypto_sha512_update(const uint8_t * data, size_t len);
void crypto_sha512_final(uint8_t * hash); void crypto_sha512_final(uint8_t * hash);
void crypto_ecc256_init(); void crypto_ecc256_init();
void crypto_ecc256_derive_public_key(uint8_t * data, int len, uint8_t * x, uint8_t * y); void crypto_ecc256_derive_public_key(const uint8_t * data, int len, uint8_t * x, uint8_t * y);
void crypto_ecc256_compute_public_key(uint8_t * privkey, uint8_t * pubkey); void crypto_ecc256_compute_public_key(uint8_t * privkey, uint8_t * pubkey);
void crypto_ecc256_load_key(uint8_t * data, int len, uint8_t * data2, int len2); void crypto_ecc256_load_key(const uint8_t * data, int len, uint8_t * data2, int len2);
void crypto_ecc256_load_attestation_key(); void crypto_ecc256_load_attestation_key();
void crypto_load_external_key(uint8_t * key, int len); void crypto_load_external_key(uint8_t * key, int len);
void crypto_ecc256_sign(uint8_t * data, int len, uint8_t * sig); void crypto_ecc256_sign(const uint8_t * data, int len, uint8_t * sig);
void crypto_ecdsa_sign(uint8_t * data, int len, uint8_t * sig, int MBEDTLS_ECP_ID); void crypto_ecdsa_sign(uint8_t * data, int len, uint8_t * sig, int MBEDTLS_ECP_ID);
void generate_private_key(uint8_t * data, int len, uint8_t * data2, int len2, uint8_t * privkey); void generate_private_key(const uint8_t * data, int len, uint8_t * data2, int len2, uint8_t * privkey);
void crypto_ecc256_make_key_pair(uint8_t * pubkey, uint8_t * privkey); void crypto_ecc256_make_key_pair(uint8_t * pubkey, uint8_t * privkey);
void crypto_ecc256_shared_secret(const uint8_t * pubkey, const uint8_t * privkey, uint8_t * shared_secret); void crypto_ecc256_shared_secret(const uint8_t * pubkey, const uint8_t * privkey, uint8_t * shared_secret);