bcrypt: Add a builtin sha384/sha512 implementation. (v2)
Sebastian Lackner
sebastian at fds-team.de
Wed Mar 8 05:03:33 CST 2017
From: Michael Müller <michael at fds-team.de>
Based on public domain implementation from
https://git.musl-libc.org/cgit/musl/tree/src/crypt/crypt_sha512.c
Signed-off-by: Michael Müller <michael at fds-team.de>
Signed-off-by: Sebastian Lackner <sebastian at fds-team.de>
---
Changes in v2:
* Get rid of the ULL suffixes for uint64 numbers (thanks Hans).
Replaces patch 4/5 (#131145), the rest of the series is still valid.
dlls/bcrypt/Makefile.in | 3
dlls/bcrypt/bcrypt_internal.h | 15 ++
dlls/bcrypt/bcrypt_main.c | 25 ++++
dlls/bcrypt/sha512.c | 211 ++++++++++++++++++++++++++++++++++++++++++
4 files changed, 253 insertions(+), 1 deletion(-)
diff --git a/dlls/bcrypt/Makefile.in b/dlls/bcrypt/Makefile.in
index c2322c8959e..602d22dca45 100644
--- a/dlls/bcrypt/Makefile.in
+++ b/dlls/bcrypt/Makefile.in
@@ -5,6 +5,7 @@ EXTRAINCL = $(GNUTLS_CFLAGS)
C_SRCS = \
bcrypt_main.c \
- sha256.c
+ sha256.c \
+ sha512.c
RC_SRCS = version.rc
diff --git a/dlls/bcrypt/bcrypt_internal.h b/dlls/bcrypt/bcrypt_internal.h
index ef137e9a20a..b12450f15ec 100644
--- a/dlls/bcrypt/bcrypt_internal.h
+++ b/dlls/bcrypt/bcrypt_internal.h
@@ -36,6 +36,21 @@ void sha256_init(SHA256_CTX *ctx) DECLSPEC_HIDDEN;
void sha256_update(SHA256_CTX *ctx, const UCHAR *buffer, ULONG len) DECLSPEC_HIDDEN;
void sha256_finalize(SHA256_CTX *ctx, UCHAR *buffer) DECLSPEC_HIDDEN;
+typedef struct
+{
+ ULONG64 len;
+ ULONG64 h[8];
+ UCHAR buf[128];
+} SHA512_CTX;
+
+void sha512_init(SHA512_CTX *ctx) DECLSPEC_HIDDEN;
+void sha512_update(SHA512_CTX *ctx, const UCHAR *buffer, ULONG len) DECLSPEC_HIDDEN;
+void sha512_finalize(SHA512_CTX *ctx, UCHAR *buffer) DECLSPEC_HIDDEN;
+
+void sha384_init(SHA512_CTX *ctx) DECLSPEC_HIDDEN;
+#define sha384_update sha512_update
+void sha384_finalize(SHA512_CTX *ctx, UCHAR *buffer) DECLSPEC_HIDDEN;
+
/* Definitions from advapi32 */
typedef struct
{
diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c
index 301f4541f88..7caac2f31a8 100644
--- a/dlls/bcrypt/bcrypt_main.c
+++ b/dlls/bcrypt/bcrypt_main.c
@@ -449,6 +449,7 @@ struct hash_impl
MD5_CTX md5;
SHA_CTX sha1;
SHA256_CTX sha256;
+ SHA512_CTX sha512;
} u;
};
@@ -468,6 +469,14 @@ static NTSTATUS hash_init( struct hash_impl *hash, enum alg_id alg_id )
sha256_init( &hash->u.sha256 );
break;
+ case ALG_ID_SHA384:
+ sha384_init( &hash->u.sha512 );
+ break;
+
+ case ALG_ID_SHA512:
+ sha512_init( &hash->u.sha512 );
+ break;
+
default:
ERR( "unhandled id %u\n", alg_id );
return STATUS_NOT_IMPLEMENTED;
@@ -492,6 +501,14 @@ static NTSTATUS hash_update( struct hash_impl *hash, enum alg_id alg_id,
sha256_update( &hash->u.sha256, input, size );
break;
+ case ALG_ID_SHA384:
+ sha384_update( &hash->u.sha512, input, size );
+ break;
+
+ case ALG_ID_SHA512:
+ sha512_update( &hash->u.sha512, input, size );
+ break;
+
default:
ERR( "unhandled id %u\n", alg_id );
return STATUS_NOT_IMPLEMENTED;
@@ -517,6 +534,14 @@ static NTSTATUS hash_finish( struct hash_impl *hash, enum alg_id alg_id,
sha256_finalize( &hash->u.sha256, output );
break;
+ case ALG_ID_SHA384:
+ sha384_finalize( &hash->u.sha512, output );
+ break;
+
+ case ALG_ID_SHA512:
+ sha512_finalize( &hash->u.sha512, output );
+ break;
+
default:
ERR( "unhandled id %u\n", alg_id );
return STATUS_NOT_IMPLEMENTED;
diff --git a/dlls/bcrypt/sha512.c b/dlls/bcrypt/sha512.c
new file mode 100644
index 00000000000..6674222e180
--- /dev/null
+++ b/dlls/bcrypt/sha512.c
@@ -0,0 +1,211 @@
+/*
+ * Copyright 2016 Michael Müller
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ *
+ */
+
+/* Based on public domain implementation from
+ https://git.musl-libc.org/cgit/musl/tree/src/crypt/crypt_sha512.c */
+
+#include "bcrypt_internal.h"
+
+static ULONG64 ror(ULONG64 n, int k) { return (n >> k) | (n << (64-k)); }
+#define Ch(x,y,z) (z ^ (x & (y ^ z)))
+#define Maj(x,y,z) ((x & y) | (z & (x | y)))
+#define S0(x) (ror(x,28) ^ ror(x,34) ^ ror(x,39))
+#define S1(x) (ror(x,14) ^ ror(x,18) ^ ror(x,41))
+#define R0(x) (ror(x,1) ^ ror(x,8) ^ (x>>7))
+#define R1(x) (ror(x,19) ^ ror(x,61) ^ (x>>6))
+
+static const ULONG64 K[80] =
+{
+ 0x428a2f98d728ae22, 0x7137449123ef65cd, 0xb5c0fbcfec4d3b2f, 0xe9b5dba58189dbbc,
+ 0x3956c25bf348b538, 0x59f111f1b605d019, 0x923f82a4af194f9b, 0xab1c5ed5da6d8118,
+ 0xd807aa98a3030242, 0x12835b0145706fbe, 0x243185be4ee4b28c, 0x550c7dc3d5ffb4e2,
+ 0x72be5d74f27b896f, 0x80deb1fe3b1696b1, 0x9bdc06a725c71235, 0xc19bf174cf692694,
+ 0xe49b69c19ef14ad2, 0xefbe4786384f25e3, 0x0fc19dc68b8cd5b5, 0x240ca1cc77ac9c65,
+ 0x2de92c6f592b0275, 0x4a7484aa6ea6e483, 0x5cb0a9dcbd41fbd4, 0x76f988da831153b5,
+ 0x983e5152ee66dfab, 0xa831c66d2db43210, 0xb00327c898fb213f, 0xbf597fc7beef0ee4,
+ 0xc6e00bf33da88fc2, 0xd5a79147930aa725, 0x06ca6351e003826f, 0x142929670a0e6e70,
+ 0x27b70a8546d22ffc, 0x2e1b21385c26c926, 0x4d2c6dfc5ac42aed, 0x53380d139d95b3df,
+ 0x650a73548baf63de, 0x766a0abb3c77b2a8, 0x81c2c92e47edaee6, 0x92722c851482353b,
+ 0xa2bfe8a14cf10364, 0xa81a664bbc423001, 0xc24b8b70d0f89791, 0xc76c51a30654be30,
+ 0xd192e819d6ef5218, 0xd69906245565a910, 0xf40e35855771202a, 0x106aa07032bbd1b8,
+ 0x19a4c116b8d2d0c8, 0x1e376c085141ab53, 0x2748774cdf8eeb99, 0x34b0bcb5e19b48a8,
+ 0x391c0cb3c5c95a63, 0x4ed8aa4ae3418acb, 0x5b9cca4f7763e373, 0x682e6ff3d6b2b8a3,
+ 0x748f82ee5defb2fc, 0x78a5636f43172f60, 0x84c87814a1f0ab72, 0x8cc702081a6439ec,
+ 0x90befffa23631e28, 0xa4506cebde82bde9, 0xbef9a3f7b2c67915, 0xc67178f2e372532b,
+ 0xca273eceea26619c, 0xd186b8c721c0c207, 0xeada7dd6cde0eb1e, 0xf57d4f7fee6ed178,
+ 0x06f067aa72176fba, 0x0a637dc5a2c898a6, 0x113f9804bef90dae, 0x1b710b35131c471b,
+ 0x28db77f523047d84, 0x32caab7b40c72493, 0x3c9ebe0a15c9bebc, 0x431d67c49c100d4c,
+ 0x4cc5d4becb3e42b6, 0x597f299cfc657e2a, 0x5fcb6fab3ad6faec, 0x6c44198c4a475817
+};
+
+static void processblock(SHA512_CTX *ctx, const UCHAR *buffer)
+{
+ ULONG64 W[80], t1, t2, a, b, c, d, e, f, g, h;
+ int i;
+
+ for (i = 0; i < 16; i++)
+ {
+ W[i] = (ULONG64)buffer[8*i]<<56;
+ W[i] |= (ULONG64)buffer[8*i+1]<<48;
+ W[i] |= (ULONG64)buffer[8*i+2]<<40;
+ W[i] |= (ULONG64)buffer[8*i+3]<<32;
+ W[i] |= (ULONG64)buffer[8*i+4]<<24;
+ W[i] |= (ULONG64)buffer[8*i+5]<<16;
+ W[i] |= (ULONG64)buffer[8*i+6]<<8;
+ W[i] |= buffer[8*i+7];
+ }
+
+ for (; i < 80; i++)
+ W[i] = R1(W[i-2]) + W[i-7] + R0(W[i-15]) + W[i-16];
+
+ a = ctx->h[0];
+ b = ctx->h[1];
+ c = ctx->h[2];
+ d = ctx->h[3];
+ e = ctx->h[4];
+ f = ctx->h[5];
+ g = ctx->h[6];
+ h = ctx->h[7];
+
+ for (i = 0; i < 80; i++)
+ {
+ t1 = h + S1(e) + Ch(e,f,g) + K[i] + W[i];
+ t2 = S0(a) + Maj(a,b,c);
+ h = g;
+ g = f;
+ f = e;
+ e = d + t1;
+ d = c;
+ c = b;
+ b = a;
+ a = t1 + t2;
+ }
+
+ ctx->h[0] += a;
+ ctx->h[1] += b;
+ ctx->h[2] += c;
+ ctx->h[3] += d;
+ ctx->h[4] += e;
+ ctx->h[5] += f;
+ ctx->h[6] += g;
+ ctx->h[7] += h;
+}
+
+static void pad(SHA512_CTX *ctx)
+{
+ ULONG64 r = ctx->len % 128;
+
+ ctx->buf[r++] = 0x80;
+ if (r > 112)
+ {
+ memset(ctx->buf + r, 0, 128 - r);
+ r = 0;
+ processblock(ctx, ctx->buf);
+ }
+
+ memset(ctx->buf + r, 0, 120 - r);
+ ctx->len *= 8;
+ ctx->buf[120] = ctx->len >> 56;
+ ctx->buf[121] = ctx->len >> 48;
+ ctx->buf[122] = ctx->len >> 40;
+ ctx->buf[123] = ctx->len >> 32;
+ ctx->buf[124] = ctx->len >> 24;
+ ctx->buf[125] = ctx->len >> 16;
+ ctx->buf[126] = ctx->len >> 8;
+ ctx->buf[127] = ctx->len;
+
+ processblock(ctx, ctx->buf);
+}
+
+void sha512_init(SHA512_CTX *ctx)
+{
+ ctx->len = 0;
+ ctx->h[0] = 0x6a09e667f3bcc908;
+ ctx->h[1] = 0xbb67ae8584caa73b;
+ ctx->h[2] = 0x3c6ef372fe94f82b;
+ ctx->h[3] = 0xa54ff53a5f1d36f1;
+ ctx->h[4] = 0x510e527fade682d1;
+ ctx->h[5] = 0x9b05688c2b3e6c1f;
+ ctx->h[6] = 0x1f83d9abfb41bd6b;
+ ctx->h[7] = 0x5be0cd19137e2179;
+}
+
+void sha512_update(SHA512_CTX *ctx, const UCHAR *buffer, ULONG len)
+{
+ const UCHAR *p = buffer;
+ unsigned r = ctx->len % 128;
+
+ ctx->len += len;
+ if (r)
+ {
+ if (len < 128 - r)
+ {
+ memcpy(ctx->buf + r, p, len);
+ return;
+ }
+ memcpy(ctx->buf + r, p, 128 - r);
+ len -= 128 - r;
+ p += 128 - r;
+ processblock(ctx, ctx->buf);
+ }
+
+ for (; len >= 128; len -= 128, p += 128)
+ processblock(ctx, p);
+
+ memcpy(ctx->buf, p, len);
+}
+
+void sha512_finalize(SHA512_CTX *ctx, UCHAR *buffer)
+{
+ int i;
+
+ pad(ctx);
+ for (i = 0; i < 8; i++)
+ {
+ buffer[8*i] = ctx->h[i] >> 56;
+ buffer[8*i+1] = ctx->h[i] >> 48;
+ buffer[8*i+2] = ctx->h[i] >> 40;
+ buffer[8*i+3] = ctx->h[i] >> 32;
+ buffer[8*i+4] = ctx->h[i] >> 24;
+ buffer[8*i+5] = ctx->h[i] >> 16;
+ buffer[8*i+6] = ctx->h[i] >> 8;
+ buffer[8*i+7] = ctx->h[i];
+ }
+}
+
+void sha384_init(SHA512_CTX *ctx)
+{
+ ctx->len = 0;
+ ctx->h[0] = 0xcbbb9d5dc1059ed8;
+ ctx->h[1] = 0x629a292a367cd507;
+ ctx->h[2] = 0x9159015a3070dd17;
+ ctx->h[3] = 0x152fecd8f70e5939;
+ ctx->h[4] = 0x67332667ffc00b31;
+ ctx->h[5] = 0x8eb44a8768581511;
+ ctx->h[6] = 0xdb0c2e0d64f98fa7;
+ ctx->h[7] = 0x47b5481dbefa4fa4;
+}
+
+void sha384_finalize(SHA512_CTX *ctx, UCHAR *buffer)
+{
+ UCHAR buffer512[64];
+
+ sha512_finalize(ctx, buffer512);
+ memcpy(buffer, buffer512, 48);
+}
--
2.11.0
More information about the wine-patches
mailing list