Micropython 1.24.1 / 1.25.0 compatibility fixes

.gitignore

@@ -51,3 +51,4 @@ Module.symvers
 Mkfile.old
 dkms.conf
 .DS_Store
+.vscode/settings.json

README.md

@@ -1,14 +1,18 @@
 # Hash functions for Bitcoin
 
+Originally from https://github.com/diybitcoinhardware/f469-disco/tree/master/usermods/uhashlib
+
+---
+
 extends `hashlib` micropython module with `ripemd160` and `sha512` functions.
 
-Also adds a single-line function for pbkdf2_hmac_sha512:
+Also adds a single-line function for pbkdf2_hmac (supports sha256 or sha512):
 
-`pbkdf2_hmac_sha512(password, salt, iterations, bytes_to_read)`
+`pbkdf2_hmac(hash_name, password, salt, iterations, bytes_to_read)`
 
 in Bitcoin to generate a seed:
 
-`pbkdf2_hmac_sha512(mnemonic, 'mnemonic'+password, 2048, 64)`
+`pbkdf2_hmac('sha512', mnemonic, 'mnemonic'+password, 2048, 64)`
 
 ## TODO:
 

crypto/sha2.c

@@ -577,7 +577,7 @@ void sha1_Update(SHA1_CTX* context, const sha2_byte *data, size_t len) {
 	usedspace = freespace = 0;
 }
 
-void sha1_Final(SHA1_CTX* context, sha2_byte digest[]) {
+void sha1_Final(SHA1_CTX* context, sha2_byte digest[SHA1_DIGEST_LENGTH]) {
 	unsigned int	usedspace;
 
 	/* If no digest buffer is passed, we don't bother doing this: */
@@ -631,7 +631,7 @@ void sha1_Final(SHA1_CTX* context, sha2_byte digest[]) {
 	usedspace = 0;
 }
 
-char *sha1_End(SHA1_CTX* context, char buffer[]) {
+char *sha1_End(SHA1_CTX* context, char buffer[SHA1_DIGEST_STRING_LENGTH]) {
 	sha2_byte	digest[SHA1_DIGEST_LENGTH], *d = digest;
 	int		i;
 
@@ -884,7 +884,7 @@ void sha256_Update(SHA256_CTX* context, const sha2_byte *data, size_t len) {
 	usedspace = freespace = 0;
 }
 
-void sha256_Final(SHA256_CTX* context, sha2_byte digest[]) {
+void sha256_Final(SHA256_CTX* context, sha2_byte digest[SHA256_DIGEST_LENGTH]) {
 	unsigned int	usedspace;
 
 	/* If no digest buffer is passed, we don't bother doing this: */
@@ -938,7 +938,7 @@ void sha256_Final(SHA256_CTX* context, sha2_byte digest[]) {
 	usedspace = 0;
 }
 
-char *sha256_End(SHA256_CTX* context, char buffer[]) {
+char *sha256_End(SHA256_CTX* context, char buffer[SHA256_DIGEST_STRING_LENGTH]) {
 	sha2_byte	digest[SHA256_DIGEST_LENGTH], *d = digest;
 	int		i;
 
@@ -1228,7 +1228,7 @@ static void sha512_Last(SHA512_CTX* context) {
 	sha512_Transform(context->state, context->buffer, context->state);
 }
 
-void sha512_Final(SHA512_CTX* context, sha2_byte digest[]) {
+void sha512_Final(SHA512_CTX* context, sha2_byte digest[SHA512_DIGEST_LENGTH]) {
 	/* If no digest buffer is passed, we don't bother doing this: */
 	if (digest != (sha2_byte*)0) {
 		sha512_Last(context);
@@ -1247,7 +1247,7 @@ void sha512_Final(SHA512_CTX* context, sha2_byte digest[]) {
 	memzero(context, sizeof(SHA512_CTX));
 }
 
-char *sha512_End(SHA512_CTX* context, char buffer[]) {
+char *sha512_End(SHA512_CTX* context, char buffer[SHA512_DIGEST_STRING_LENGTH]) {
 	sha2_byte	digest[SHA512_DIGEST_LENGTH], *d = digest;
 	int		i;