Mercurial > dovecot > core-2.2

changeset 5758:2cba4c0f3b4f HEAD

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Added support for SHA256. Based on patch by Jasper Slits.
author Timo Sirainen <tss@iki.fi>
date Sat, 16 Jun 2007 04:02:20 +0300
parents f71e234d72e4
children 6074f59f91ba
files COPYING src/auth/password-scheme.c src/lib/Makefile.am src/lib/sha2.c src/lib/sha2.h
diffstat 5 files changed, 320 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/COPYING	Sat Jun 16 03:45:09 2007 +0300
+++ b/COPYING	Sat Jun 16 04:02:20 2007 +0300
@@ -9,4 +9,5 @@
 
 src/lib/
   - md5.c : Public Domain
+  - sha1.c, sha2.c : BSD
   - base64.c, utc-mktime.c : BSD-like (read it)
--- a/src/auth/password-scheme.c	Sat Jun 16 03:45:09 2007 +0300
+++ b/src/auth/password-scheme.c	Sat Jun 16 04:02:20 2007 +0300
@@ -12,6 +12,7 @@
 #include "mycrypt.h"
 #include "randgen.h"
 #include "sha1.h"
+#include "sha2.h"
 #include "otp.h"
 #include "str.h"
 #include "password-scheme.h"
@@ -324,6 +325,19 @@
 }
 
 static void
+sha256_generate(const char *plaintext, const char *user __attr_unused__,
+		const unsigned char **raw_password_r, size_t *size_r)
+{
+	unsigned char *digest;
+
+	digest = t_malloc(SHA256_RESULTLEN);
+	sha256_get_digest(plaintext, strlen(plaintext), digest);
+
+	*raw_password_r = digest;
+	*size_r = SHA256_RESULTLEN;
+}
+
+static void
 ssha_generate(const char *plaintext, const char *user __attr_unused__,
 	      const unsigned char **raw_password_r, size_t *size_r)
 {
@@ -554,6 +568,8 @@
 	  md5_crypt_verify, md5_crypt_generate },
  	{ "SHA", PW_ENCODING_BASE64, SHA1_RESULTLEN, NULL, sha1_generate },
  	{ "SHA1", PW_ENCODING_BASE64, SHA1_RESULTLEN, NULL, sha1_generate },
+ 	{ "SHA256", PW_ENCODING_BASE64, SHA256_RESULTLEN,
+	  NULL, sha256_generate },
 	{ "SMD5", PW_ENCODING_BASE64, 0, smd5_verify, smd5_generate },
 	{ "SSHA", PW_ENCODING_BASE64, 0, ssha_verify, ssha_generate },
 	{ "PLAIN", PW_ENCODING_NONE, 0, NULL, plain_generate },
--- a/src/lib/Makefile.am	Sat Jun 16 03:45:09 2007 +0300
+++ b/src/lib/Makefile.am	Sat Jun 16 04:02:20 2007 +0300
@@ -78,6 +78,7 @@
 	sendfile-util.c \
 	seq-range-array.c \
 	sha1.c \
+	sha2.c \
 	str.c \
 	str-find.c \
 	str-sanitize.c \
@@ -158,6 +159,7 @@
 	sendfile-util.h \
 	seq-range-array.h \
 	sha1.h \
+	sha2.h \
 	str.h \
 	str-find.h \
 	str-sanitize.h \
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/lib/sha2.c	Sat Jun 16 04:02:20 2007 +0300
@@ -0,0 +1,246 @@
+/*
+ * FIPS 180-2 SHA-224/256/384/512 implementation
+ * Last update: 02/02/2007
+ * Issue date:  04/30/2005
+ *
+ * Copyright (C) 2005, 2007 Olivier Gay <olivier.gay@a3.epfl.ch>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the project nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include "lib.h"
+#include "sha2.h"
+
+#define SHFR(x, n)    (x >> n)
+#define ROTR(x, n)   ((x >> n) | (x << ((sizeof(x) << 3) - n)))
+#define ROTL(x, n)   ((x << n) | (x >> ((sizeof(x) << 3) - n)))
+#define CH(x, y, z)  ((x & y) ^ (~x & z))
+#define MAJ(x, y, z) ((x & y) ^ (x & z) ^ (y & z))
+
+#define SHA256_F1(x) (ROTR(x,  2) ^ ROTR(x, 13) ^ ROTR(x, 22))
+#define SHA256_F2(x) (ROTR(x,  6) ^ ROTR(x, 11) ^ ROTR(x, 25))
+#define SHA256_F3(x) (ROTR(x,  7) ^ ROTR(x, 18) ^ SHFR(x,  3))
+#define SHA256_F4(x) (ROTR(x, 17) ^ ROTR(x, 19) ^ SHFR(x, 10))
+
+#define UNPACK32(x, str)                      \
+{                                             \
+    *((str) + 3) = (uint8_t) ((x)      );     \
+    *((str) + 2) = (uint8_t) ((x) >>  8);     \
+    *((str) + 1) = (uint8_t) ((x) >> 16);     \
+    *((str) + 0) = (uint8_t) ((x) >> 24);     \
+}
+
+#define PACK32(str, x)                        \
+{                                             \
+    *(x) =   ((uint32_t) *((str) + 3)      )  \
+           | ((uint32_t) *((str) + 2) <<  8)  \
+           | ((uint32_t) *((str) + 1) << 16)  \
+           | ((uint32_t) *((str) + 0) << 24); \
+}
+
+#define UNPACK64(x, str)                      \
+{                                             \
+    *((str) + 7) = (uint8_t) ((x)      );     \
+    *((str) + 6) = (uint8_t) ((x) >>  8);     \
+    *((str) + 5) = (uint8_t) ((x) >> 16);     \
+    *((str) + 4) = (uint8_t) ((x) >> 24);     \
+    *((str) + 3) = (uint8_t) ((x) >> 32);     \
+    *((str) + 2) = (uint8_t) ((x) >> 40);     \
+    *((str) + 1) = (uint8_t) ((x) >> 48);     \
+    *((str) + 0) = (uint8_t) ((x) >> 56);     \
+}
+
+#define PACK64(str, x)                        \
+{                                             \
+    *(x) =   ((uint64_t) *((str) + 7)      )  \
+           | ((uint64_t) *((str) + 6) <<  8)  \
+           | ((uint64_t) *((str) + 5) << 16)  \
+           | ((uint64_t) *((str) + 4) << 24)  \
+           | ((uint64_t) *((str) + 3) << 32)  \
+           | ((uint64_t) *((str) + 2) << 40)  \
+           | ((uint64_t) *((str) + 1) << 48)  \
+           | ((uint64_t) *((str) + 0) << 56); \
+}
+
+/* Macros used for loops unrolling */
+
+#define SHA256_SCR(i)                         \
+{                                             \
+    w[i] =  SHA256_F4(w[i -  2]) + w[i -  7]  \
+          + SHA256_F3(w[i - 15]) + w[i - 16]; \
+}
+
+
+
+static const uint32_t sha256_h0[8] =
+            {0x6a09e667, 0xbb67ae85, 0x3c6ef372, 0xa54ff53a,
+             0x510e527f, 0x9b05688c, 0x1f83d9ab, 0x5be0cd19};
+
+
+static const uint32_t sha256_k[64] =
+            {0x428a2f98, 0x71374491, 0xb5c0fbcf, 0xe9b5dba5,
+             0x3956c25b, 0x59f111f1, 0x923f82a4, 0xab1c5ed5,
+             0xd807aa98, 0x12835b01, 0x243185be, 0x550c7dc3,
+             0x72be5d74, 0x80deb1fe, 0x9bdc06a7, 0xc19bf174,
+             0xe49b69c1, 0xefbe4786, 0x0fc19dc6, 0x240ca1cc,
+             0x2de92c6f, 0x4a7484aa, 0x5cb0a9dc, 0x76f988da,
+             0x983e5152, 0xa831c66d, 0xb00327c8, 0xbf597fc7,
+             0xc6e00bf3, 0xd5a79147, 0x06ca6351, 0x14292967,
+             0x27b70a85, 0x2e1b2138, 0x4d2c6dfc, 0x53380d13,
+             0x650a7354, 0x766a0abb, 0x81c2c92e, 0x92722c85,
+             0xa2bfe8a1, 0xa81a664b, 0xc24b8b70, 0xc76c51a3,
+             0xd192e819, 0xd6990624, 0xf40e3585, 0x106aa070,
+             0x19a4c116, 0x1e376c08, 0x2748774c, 0x34b0bcb5,
+             0x391c0cb3, 0x4ed8aa4a, 0x5b9cca4f, 0x682e6ff3,
+             0x748f82ee, 0x78a5636f, 0x84c87814, 0x8cc70208,
+             0x90befffa, 0xa4506ceb, 0xbef9a3f7, 0xc67178f2};
+
+
+/* SHA-256 functions */
+
+static void sha256_transf(struct sha256_ctx *ctx, const unsigned char *data,
+			  size_t block_nb)
+{
+	uint32_t w[64];
+	uint32_t wv[8];
+	uint32_t t1, t2;
+	const unsigned char *sub_block;
+	int i,j;
+
+
+	for (i = 0; i < (int) block_nb; i++) {
+		sub_block = data + (i << 6);
+
+		for (j = 0; j < 16; j++) {
+			PACK32(&sub_block[j << 2], &w[j]);
+		}
+
+		for (j = 16; j < 64; j++) {
+			SHA256_SCR(j);
+		}
+
+		for (j = 0; j < 8; j++) {
+			wv[j] = ctx->h[j];
+		}
+
+		for (j = 0; j < 64; j++) {
+			t1 = wv[7] + SHA256_F2(wv[4]) + CH(wv[4], wv[5], wv[6])
+				+ sha256_k[j] + w[j];
+			t2 = SHA256_F1(wv[0]) + MAJ(wv[0], wv[1], wv[2]);
+			wv[7] = wv[6];
+			wv[6] = wv[5];
+			wv[5] = wv[4];
+			wv[4] = wv[3] + t1;
+			wv[3] = wv[2];
+			wv[2] = wv[1];
+			wv[1] = wv[0];
+			wv[0] = t1 + t2;
+		}
+
+		for (j = 0; j < 8; j++) {
+			ctx->h[j] += wv[j];
+		}
+	}
+}
+
+void sha256_init(struct sha256_ctx *ctx)
+{
+	int i;
+
+	for (i = 0; i < 8; i++) {
+		ctx->h[i] = sha256_h0[i];
+	}
+
+	ctx->len = 0;
+	ctx->tot_len = 0;
+}
+
+void sha256_loop(struct sha256_ctx *ctx, const unsigned char *data,
+		 size_t len)
+{
+	const unsigned char *shifted_message;
+	size_t block_nb;
+	size_t new_len, rem_len, tmp_len;
+
+	tmp_len = SHA256_BLOCK_SIZE - ctx->len;
+	rem_len = len < tmp_len ? len : tmp_len;
+
+	memcpy(&ctx->block[ctx->len], data, rem_len);
+
+	if (ctx->len + len < SHA256_BLOCK_SIZE) {
+		ctx->len += len;
+		return;
+	}
+
+	new_len = len - rem_len;
+	block_nb = new_len / SHA256_BLOCK_SIZE;
+
+	shifted_message = data + rem_len;
+
+	sha256_transf(ctx, ctx->block, 1);
+	sha256_transf(ctx, shifted_message, block_nb);
+
+	rem_len = new_len % SHA256_BLOCK_SIZE;
+	memcpy(ctx->block, &shifted_message[block_nb << 6], rem_len);
+
+	ctx->len = rem_len;
+	ctx->tot_len += (block_nb + 1) << 6;
+}
+
+void sha256_result(struct sha256_ctx *ctx,
+		   unsigned char digest[SHA256_RESULTLEN])
+{
+	size_t block_nb;
+	size_t pm_len;
+	size_t len_b;
+	int i;
+
+	block_nb = (1 + ((SHA256_BLOCK_SIZE - 9)
+			 < (ctx->len % SHA256_BLOCK_SIZE)));
+
+	len_b = (ctx->tot_len + ctx->len) << 3;
+	pm_len = block_nb << 6;
+
+	memset(ctx->block + ctx->len, 0, pm_len - ctx->len);
+	ctx->block[ctx->len] = 0x80;
+	UNPACK32(len_b, ctx->block + pm_len - 4);
+
+	sha256_transf(ctx, ctx->block, block_nb);
+
+	for (i = 0 ; i < 8; i++) {
+		UNPACK32(ctx->h[i], &digest[i << 2]);
+	}
+}
+
+void sha256_get_digest(const void *data, size_t size,
+		       unsigned char digest[SHA256_RESULTLEN])
+{
+	struct sha256_ctx ctx;
+
+	sha256_init(&ctx);
+	sha256_loop(&ctx, data, size);
+	sha256_result(&ctx, digest);
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/lib/sha2.h	Sat Jun 16 04:02:20 2007 +0300
@@ -0,0 +1,55 @@
+/*
+ * FIPS 180-2 SHA-224/256/384/512 implementation
+ * Last update: 02/02/2007
+ * Issue date:  04/30/2005
+ *
+ * Copyright (C) 2005, 2007 Olivier Gay <olivier.gay@a3.epfl.ch>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the project nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#ifndef SHA2_H
+#define SHA2_H
+
+#define SHA256_RESULTLEN (256 / 8)
+#define SHA256_BLOCK_SIZE (512 / 8)
+
+struct sha256_ctx {
+	size_t tot_len;
+	size_t len;
+	unsigned char block[2 * SHA256_BLOCK_SIZE];
+	uint32_t h[8];
+};
+
+void sha256_init(struct sha256_ctx *ctx);
+void sha256_loop(struct sha256_ctx *ctx, const unsigned char *data, size_t len);
+void sha256_result(struct sha256_ctx *ctx,
+		   unsigned char digest[SHA256_RESULTLEN]);
+
+void sha256_get_digest(const void *data, size_t size,
+		       unsigned char digest[SHA256_RESULTLEN]);
+
+#endif /* !SHA2_H */