svn commit: r336539 - in head: lib/libmd sys/crypto/sha2 sys/crypto/skein
Xin LI
delphij at FreeBSD.org
Fri Jul 20 07:01:32 UTC 2018
Author: delphij
Date: Fri Jul 20 07:01:28 2018
New Revision: 336539
URL: https://svnweb.freebsd.org/changeset/base/336539
Log:
libmd: Always erase context in _Final method, and when doing
it, consistently use explicit_bzero().
Update manual pages to match the behavior.
Reviewed by: pfg, allanjude, jmg
MFC after: 1 month
Differential Revision: https://reviews.freebsd.org/D16316
Modified:
head/lib/libmd/md4c.c
head/lib/libmd/md5c.c
head/lib/libmd/mdX.3
head/lib/libmd/ripemd.3
head/lib/libmd/rmd160c.c
head/lib/libmd/sha.3
head/lib/libmd/sha0c.c
head/lib/libmd/sha1c.c
head/lib/libmd/sha256.3
head/lib/libmd/sha512.3
head/lib/libmd/skein.3
head/sys/crypto/sha2/sha256c.c
head/sys/crypto/sha2/sha512c.c
head/sys/crypto/skein/skein.c
Modified: head/lib/libmd/md4c.c
==============================================================================
--- head/lib/libmd/md4c.c Fri Jul 20 05:34:02 2018 (r336538)
+++ head/lib/libmd/md4c.c Fri Jul 20 07:01:28 2018 (r336539)
@@ -183,7 +183,7 @@ MD4_CTX *context;
/* Zeroize sensitive information.
*/
- memset ((POINTER)context, 0, sizeof (*context));
+ explicit_bzero(context, sizeof(*context));
}
/* MD4 basic transformation. Transforms state based on block.
Modified: head/lib/libmd/md5c.c
==============================================================================
--- head/lib/libmd/md5c.c Fri Jul 20 05:34:02 2018 (r336538)
+++ head/lib/libmd/md5c.c Fri Jul 20 07:01:28 2018 (r336539)
@@ -220,7 +220,7 @@ MD5Final (unsigned char digest[16], MD5_CTX *context)
Encode (digest, context->state, 16);
/* Zeroize sensitive information. */
- memset ((void *)context, 0, sizeof (*context));
+ explicit_bzero(context, sizeof(*context));
}
/* MD5 basic transformation. Transforms state based on block. */
Modified: head/lib/libmd/mdX.3
==============================================================================
--- head/lib/libmd/mdX.3 Fri Jul 20 05:34:02 2018 (r336538)
+++ head/lib/libmd/mdX.3 Fri Jul 20 07:01:28 2018 (r336539)
@@ -8,7 +8,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd April 26, 2016
+.Dd July 20, 2018
.Dt MDX 3
.Os
.Sh NAME
@@ -78,7 +78,9 @@ initialize it with
run over the data with
.Fn MDXUpdate ,
and finally extract the result using
-.Fn MDXFinal .
+.Fn MDXFinal ,
+which will also erase the
+.Vt MDX_CTX .
.Pp
The
.Fn MDXPad
Modified: head/lib/libmd/ripemd.3
==============================================================================
--- head/lib/libmd/ripemd.3 Fri Jul 20 05:34:02 2018 (r336538)
+++ head/lib/libmd/ripemd.3 Fri Jul 20 07:01:28 2018 (r336539)
@@ -9,7 +9,7 @@
.\" From: Id: mdX.3,v 1.14 1999/02/11 20:31:49 wollman Exp
.\" $FreeBSD$
.\"
-.Dd April 26, 2016
+.Dd July 20, 2018
.Dt RIPEMD 3
.Os
.Sh NAME
@@ -65,7 +65,9 @@ initialize it with
run over the data with
.Fn RIPEMD160_Update ,
and finally extract the result using
-.Fn RIPEMD160_Final .
+.Fn RIPEMD160_Final ,
+which will also erase the
+.Vt RIPEMD160_CTX .
.Pp
The
.Fn RIPEMD160_End
Modified: head/lib/libmd/rmd160c.c
==============================================================================
--- head/lib/libmd/rmd160c.c Fri Jul 20 05:34:02 2018 (r336538)
+++ head/lib/libmd/rmd160c.c Fri Jul 20 07:01:28 2018 (r336539)
@@ -523,10 +523,8 @@ RIPEMD160_CTX *c;
l=c->D; l2c(l,cp);
l=c->E; l2c(l,cp);
- /* clear stuff, ripemd160_block may be leaving some stuff on the stack
- * but I'm not worried :-) */
- c->num=0;
-/* memset((char *)&c,0,sizeof(c));*/
+ /* Clear the context state */
+ explicit_bzero(&c, sizeof(c));
}
#ifdef undef
Modified: head/lib/libmd/sha.3
==============================================================================
--- head/lib/libmd/sha.3 Fri Jul 20 05:34:02 2018 (r336538)
+++ head/lib/libmd/sha.3 Fri Jul 20 07:01:28 2018 (r336539)
@@ -9,7 +9,7 @@
.\" From: Id: mdX.3,v 1.14 1999/02/11 20:31:49 wollman Exp
.\" $FreeBSD$
.\"
-.Dd April 26, 2016
+.Dd July 20, 2018
.Dt SHA 3
.Os
.Sh NAME
@@ -100,7 +100,9 @@ initialize it with
run over the data with
.Fn SHA1_Update ,
and finally extract the result using
-.Fn SHA1_Final .
+.Fn SHA1_Final ,
+which will also erase the
+.Vt SHA_CTX .
.Pp
.Fn SHA1_End
is a wrapper for
Modified: head/lib/libmd/sha0c.c
==============================================================================
--- head/lib/libmd/sha0c.c Fri Jul 20 05:34:02 2018 (r336538)
+++ head/lib/libmd/sha0c.c Fri Jul 20 07:01:28 2018 (r336539)
@@ -446,9 +446,7 @@ SHA_CTX *c;
l=c->h3; nl2c(l,cp);
l=c->h4; nl2c(l,cp);
- /* clear stuff, sha_block may be leaving some stuff on the stack
- * but I'm not worried :-) */
- c->num=0;
-/* memset((char *)&c,0,sizeof(c));*/
+ /* Clear the context state */
+ explicit_bzero(&c, sizeof(c));
}
Modified: head/lib/libmd/sha1c.c
==============================================================================
--- head/lib/libmd/sha1c.c Fri Jul 20 05:34:02 2018 (r336538)
+++ head/lib/libmd/sha1c.c Fri Jul 20 07:01:28 2018 (r336539)
@@ -482,10 +482,8 @@ SHA_CTX *c;
l=c->h3; nl2c(l,cp);
l=c->h4; nl2c(l,cp);
- /* clear stuff, sha1_block may be leaving some stuff on the stack
- * but I'm not worried :-) */
- c->num=0;
-/* memset((char *)&c,0,sizeof(c));*/
+ /* Clear the context state */
+ explicit_bzero(&c, sizeof(c));
}
#ifdef WEAK_REFS
Modified: head/lib/libmd/sha256.3
==============================================================================
--- head/lib/libmd/sha256.3 Fri Jul 20 05:34:02 2018 (r336538)
+++ head/lib/libmd/sha256.3 Fri Jul 20 07:01:28 2018 (r336539)
@@ -9,7 +9,7 @@
.\" From: Id: mdX.3,v 1.14 1999/02/11 20:31:49 wollman Exp
.\" $FreeBSD$
.\"
-.Dd July 9, 2018
+.Dd July 20, 2018
.Dt SHA256 3
.Os
.Sh NAME
@@ -88,7 +88,9 @@ initialize it with
run over the data with
.Fn SHA256_Update ,
and finally extract the result using
-.Fn SHA256_Final .
+.Fn SHA256_Final ,
+which will also erase the
+.Vt SHA256_CTX .
.Pp
.Fn SHA256_End
is a wrapper for
Modified: head/lib/libmd/sha512.3
==============================================================================
--- head/lib/libmd/sha512.3 Fri Jul 20 05:34:02 2018 (r336538)
+++ head/lib/libmd/sha512.3 Fri Jul 20 07:01:28 2018 (r336539)
@@ -9,7 +9,7 @@
.\" From: Id: mdX.3,v 1.14 1999/02/11 20:31:49 wollman Exp
.\" $FreeBSD$
.\"
-.Dd April 22, 2016
+.Dd July 20, 2018
.Dt SHA512 3
.Os
.Sh NAME
@@ -110,7 +110,9 @@ initialize it with
run over the data with
.Fn SHA512_Update ,
and finally extract the result using
-.Fn SHA512_Final .
+.Fn SHA512_Final ,
+which will also erase the
+.Vt SHA512_CTX .
.Pp
.Fn SHA512_End
is a wrapper for
Modified: head/lib/libmd/skein.3
==============================================================================
--- head/lib/libmd/skein.3 Fri Jul 20 05:34:02 2018 (r336538)
+++ head/lib/libmd/skein.3 Fri Jul 20 07:01:28 2018 (r336539)
@@ -124,7 +124,9 @@ initialize it with
run over the data with
.Fn SKEIN256_Update ,
and finally extract the result using
-.Fn SKEIN256_Final .
+.Fn SKEIN256_Final ,
+which will also erase the
+.Vt SKEIN256_CTX .
.Pp
.Fn SKEIN256_End
is a wrapper for
Modified: head/sys/crypto/sha2/sha256c.c
==============================================================================
--- head/sys/crypto/sha2/sha256c.c Fri Jul 20 05:34:02 2018 (r336538)
+++ head/sys/crypto/sha2/sha256c.c Fri Jul 20 07:01:28 2018 (r336539)
@@ -298,7 +298,7 @@ SHA256_Final(unsigned char digest[static SHA256_DIGEST
be32enc_vect(digest, ctx->state, SHA256_DIGEST_LENGTH);
/* Clear the context state */
- memset(ctx, 0, sizeof(*ctx));
+ explicit_bzero(ctx, sizeof(*ctx));
}
/*** SHA-224: *********************************************************/
Modified: head/sys/crypto/sha2/sha512c.c
==============================================================================
--- head/sys/crypto/sha2/sha512c.c Fri Jul 20 05:34:02 2018 (r336538)
+++ head/sys/crypto/sha2/sha512c.c Fri Jul 20 07:01:28 2018 (r336539)
@@ -331,7 +331,7 @@ SHA512_Final(unsigned char digest[static SHA512_DIGEST
be64enc_vect(digest, ctx->state, SHA512_DIGEST_LENGTH);
/* Clear the context state */
- memset(ctx, 0, sizeof(*ctx));
+ explicit_bzero(ctx, sizeof(*ctx));
}
/*** SHA-512t: *********************************************************/
@@ -374,7 +374,7 @@ SHA512_224_Final(unsigned char digest[static SHA512_22
be64enc_vect(digest, ctx->state, SHA512_224_DIGEST_LENGTH);
/* Clear the context state */
- memset(ctx, 0, sizeof(*ctx));
+ explicit_bzero(ctx, sizeof(*ctx));
}
void
@@ -413,7 +413,7 @@ SHA512_256_Final(unsigned char digest[static SHA512_25
be64enc_vect(digest, ctx->state, SHA512_256_DIGEST_LENGTH);
/* Clear the context state */
- memset(ctx, 0, sizeof(*ctx));
+ explicit_bzero(ctx, sizeof(*ctx));
}
/*** SHA-384: *********************************************************/
@@ -463,7 +463,7 @@ SHA384_Final(unsigned char digest[static SHA384_DIGEST
be64enc_vect(digest, ctx->state, SHA384_DIGEST_LENGTH);
/* Clear the context state */
- memset(ctx, 0, sizeof(*ctx));
+ explicit_bzero(ctx, sizeof(*ctx));
}
#ifdef WEAK_REFS
Modified: head/sys/crypto/skein/skein.c
==============================================================================
--- head/sys/crypto/skein/skein.c Fri Jul 20 05:34:02 2018 (r336538)
+++ head/sys/crypto/skein/skein.c Fri Jul 20 07:01:28 2018 (r336539)
@@ -812,6 +812,7 @@ SKEIN256_Final(unsigned char digest[static SKEIN_256_B
{
Skein_256_Final(ctx, digest);
+ explicit_bzero(ctx, sizeof(*ctx));
}
void
@@ -819,6 +820,7 @@ SKEIN512_Final(unsigned char digest[static SKEIN_512_B
{
Skein_512_Final(ctx, digest);
+ explicit_bzero(ctx, sizeof(*ctx));
}
void
@@ -826,6 +828,7 @@ SKEIN1024_Final(unsigned char digest[static SKEIN1024_
{
Skein1024_Final(ctx, digest);
+ explicit_bzero(ctx, sizeof(*ctx));
}
#ifdef WEAK_REFS
More information about the svn-src-all
mailing list