git: plan9front

Download patch

ref: 5169005b1330dcfbadd6f1e8d944493cfd00c420
parent: 26f0aa33d91442fc7a56fc5f5c9b56b5f5f84ce2
author: Jacob Moody <moody@posixcafe.org>
date: Tue May 20 16:57:30 EDT 2025 

libsec: B2s_256dlen -> BLAKE2s_256dlen

better match other cryptographic hash dlen names


--- a/sys/include/ape/libsec.h
+++ b/sys/include/ape/libsec.h
@@ -231,16 +231,16 @@
 
 enum
 {
-	SHA1dlen=	20,	/* SHA digest length */
-	SHA2_224dlen=	28,	/* SHA-224 digest length */
-	SHA2_256dlen=	32,	/* SHA-256 digest length */
-	SHA2_384dlen=	48,	/* SHA-384 digest length */
-	SHA2_512dlen=	64,	/* SHA-512 digest length */
-	MD4dlen=	16,	/* MD4 digest length */
-	MD5dlen=	16,	/* MD5 digest length */
-	RIPEMD160dlen=	20,	/* RIPEMD-160 digest length */
-	Poly1305dlen=	16,	/* Poly1305 digest length */
-	B2s_256dlen=	32,	/* Blake2s-256 digest length */
+	SHA1dlen=		20,	/* SHA digest length */
+	SHA2_224dlen=		28,	/* SHA-224 digest length */
+	SHA2_256dlen=		32,	/* SHA-256 digest length */
+	SHA2_384dlen=		48,	/* SHA-384 digest length */
+	SHA2_512dlen=		64,	/* SHA-512 digest length */
+	MD4dlen=		16,	/* MD4 digest length */
+	MD5dlen=		16,	/* MD5 digest length */
+	RIPEMD160dlen=		20,	/* RIPEMD-160 digest length */
+	Poly1305dlen=		16,	/* Poly1305 digest length */
+	BLAKE2S_256dlen=	32,	/* Blake2s-256 digest length */
 
 	Hmacblksz	= 64,	/* in bytes; from rfc2104 */
 };
--- a/sys/include/libsec.h
+++ b/sys/include/libsec.h
@@ -223,16 +223,16 @@
 
 enum
 {
-	SHA1dlen=	20,	/* SHA digest length */
-	SHA2_224dlen=	28,	/* SHA-224 digest length */
-	SHA2_256dlen=	32,	/* SHA-256 digest length */
-	SHA2_384dlen=	48,	/* SHA-384 digest length */
-	SHA2_512dlen=	64,	/* SHA-512 digest length */
-	MD4dlen=	16,	/* MD4 digest length */
-	MD5dlen=	16,	/* MD5 digest length */
-	RIPEMD160dlen=	20,	/* RIPEMD-160 digest length */
-	Poly1305dlen=	16,	/* Poly1305 digest length */
-	B2s_256dlen=	32,	/* Blake2s-256 digest length */
+	SHA1dlen=		20,	/* SHA digest length */
+	SHA2_224dlen=		28,	/* SHA-224 digest length */
+	SHA2_256dlen=		32,	/* SHA-256 digest length */
+	SHA2_384dlen=		48,	/* SHA-384 digest length */
+	SHA2_512dlen=		64,	/* SHA-512 digest length */
+	MD4dlen=		16,	/* MD4 digest length */
+	MD5dlen=		16,	/* MD5 digest length */
+	RIPEMD160dlen=		20,	/* RIPEMD-160 digest length */
+	Poly1305dlen=		16,	/* Poly1305 digest length */
+	BLAKE2S_256dlen=	32,	/* Blake2s-256 digest length */
 
 	Hmacblksz	= 64,	/* in bytes; from rfc2104 */
 };
--- a/sys/man/2/sechash
+++ b/sys/man/2/sechash
@@ -113,7 +113,7 @@
 .IR SHA2_256dlen ,
 .IR SHA2_384dlen ,
 .IR SHA2_512dlen ,
-.I B2s_256dlen
+.I BLAKE2S_256dlen
 and
 .I Poly1305dlen
 define the lengths of the digests.
--- a/sys/src/libsec/port/blake2s.c
+++ b/sys/src/libsec/port/blake2s.c
@@ -39,10 +39,10 @@
 		s->state[6] = 0x1F83D9ABUL;
 		s->state[7] = 0x5BE0CD19UL;
 
-		s->state[0] ^= 0x01010000 ^ B2s_256dlen;
+		s->state[0] ^= 0x01010000 ^ BLAKE2S_256dlen;
 		s->seeded = 1;
 	}
-	return blake2s_512(p, len, digest, s, B2s_256dlen);
+	return blake2s_512(p, len, digest, s, BLAKE2S_256dlen);
 }
 
 enum{
@@ -131,5 +131,5 @@
 DigestState*
 hmac_blake2s_256(uchar *p, ulong len, uchar *key, ulong klen, uchar *digest, DigestState *s)
 {
-	return hmac_x(p, len, key, klen, digest, s, blake2s_256, B2s_256dlen);
+	return hmac_x(p, len, key, klen, digest, s, blake2s_256, BLAKE2S_256dlen);
 }
--- a/sys/src/libsec/test/blake2s.c
+++ b/sys/src/libsec/test/blake2s.c
@@ -39,7 +39,7 @@
 main(int, char**)
 {
 	DigestState *s;
-	uchar digest[B2s_256dlen];
+	uchar digest[BLAKE2S_256dlen];
 	char buf[256];
 	int i;
 	char *p;
@@ -47,7 +47,7 @@
 	fmtinstall('H', encodefmt);
 	for(i = 0; i < nelem(tests); i++){
 		blake2s_256((uchar*)tests[i].in, strlen(tests[i].in), digest, nil);
-		snprint(buf, sizeof buf, "%.*lH", B2s_256dlen, digest);
+		snprint(buf, sizeof buf, "%.*lH", BLAKE2S_256dlen, digest);
 		if(strcmp(buf, tests[i].exp) != 0){
 			fprint(2, "Test: %s\nExp: %s\nGot: %s\n\n", tests[i].in, tests[i].exp, buf);
 			exits("fail");
@@ -54,12 +54,12 @@
 		}
 
 		s = nil;
-		memset(digest, 0, B2s_256dlen);
+		memset(digest, 0, BLAKE2S_256dlen);
 		for(p = tests[i].in; *p != 0; p++)
 			s = blake2s_256((uchar*)p, 1, nil, s);
 
 		blake2s_256(nil, 0, digest, s);
-		snprint(buf, sizeof buf, "%.*lH", B2s_256dlen, digest);
+		snprint(buf, sizeof buf, "%.*lH", BLAKE2S_256dlen, digest);
 		if(strcmp(buf, tests[i].exp) != 0){
 			fprint(2, "Trickle Test: %s\nExp: %s\nGot: %s\n\n", tests[i].in, tests[i].exp, buf);
 			exits("fail");
-- 
⑨