From db7fe5d435d76bf330977678fc224e78a96645ff Mon Sep 17 00:00:00 2001
From: miod <>
Date: Fri, 20 Jun 2014 10:38:22 +0000
Subject: Simple regress test for the amd64 bn_mul_mont bug found by Joyent (
 https://github.com/joyent/node/issues/7704 ), about to be fixed in libcrypto.

---
 src/regress/lib/libcrypto/bn/Makefile      |  5 +-
 src/regress/lib/libcrypto/bn/mont/Makefile |  9 ++++
 src/regress/lib/libcrypto/bn/mont/mont.c   | 74 ++++++++++++++++++++++++++++++
 3 files changed, 86 insertions(+), 2 deletions(-)
 create mode 100644 src/regress/lib/libcrypto/bn/mont/Makefile
 create mode 100644 src/regress/lib/libcrypto/bn/mont/mont.c

diff --git a/src/regress/lib/libcrypto/bn/Makefile b/src/regress/lib/libcrypto/bn/Makefile
index a19e456892..93c3962e12 100644
--- a/src/regress/lib/libcrypto/bn/Makefile
+++ b/src/regress/lib/libcrypto/bn/Makefile
@@ -1,7 +1,8 @@
-#	$OpenBSD: Makefile,v 1.3 2014/06/20 10:30:40 miod Exp $
+#	$OpenBSD: Makefile,v 1.4 2014/06/20 10:38:22 miod Exp $
 
 SUBDIR= \
-	general
+	general \
+	mont
 
 install:
 
diff --git a/src/regress/lib/libcrypto/bn/mont/Makefile b/src/regress/lib/libcrypto/bn/mont/Makefile
new file mode 100644
index 0000000000..3a946b41a8
--- /dev/null
+++ b/src/regress/lib/libcrypto/bn/mont/Makefile
@@ -0,0 +1,9 @@
+#	$OpenBSD: Makefile,v 1.1 2014/06/20 10:38:22 miod Exp $
+
+PROG=	mont
+LDADD=	-lcrypto
+DPADD=	${LIBCRYPTO}
+WARNINGS=	Yes
+CFLAGS+=	-Werror
+
+.include <bsd.regress.mk>
diff --git a/src/regress/lib/libcrypto/bn/mont/mont.c b/src/regress/lib/libcrypto/bn/mont/mont.c
new file mode 100644
index 0000000000..2a60c022c3
--- /dev/null
+++ b/src/regress/lib/libcrypto/bn/mont/mont.c
@@ -0,0 +1,74 @@
+/*	$OpenBSD: mont.c,v 1.1 2014/06/20 10:38:22 miod Exp $	*/
+
+/*
+ * Copyright (c) 2014 Miodrag Vallat.
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <err.h>
+
+#include <openssl/bn.h>
+#include <openssl/crypto.h>
+#include <openssl/dh.h>
+#include <openssl/err.h>
+#include <openssl/rand.h>
+
+/*
+ * Test for proper bn_mul_mont behaviour when operands are of vastly different
+ * sizes.
+ */
+
+int
+main(int argc, char *argv[])
+{
+	DH *dh;
+	unsigned char *key, r[32 + 16 * 8];
+	size_t privsz;
+
+	RAND_bytes(r, sizeof r);
+
+	for (privsz = 32; privsz <= sizeof(r); privsz += 8) {
+		dh = DH_new();
+		if (dh == NULL)
+			goto err;
+		if (DH_generate_parameters_ex(dh, 32, DH_GENERATOR_2,
+		    NULL) == 0)
+			goto err;
+
+		/* force private key to be much larger than public one */
+		dh->priv_key = BN_bin2bn(r, privsz, NULL);
+		if (dh->priv_key == NULL)
+			goto err;
+
+		if (DH_generate_key(dh) == 0)
+			goto err;
+		key = malloc(DH_size(dh));
+		if (key == NULL)
+			err(1, "malloc");
+		if (DH_compute_key(key, dh->pub_key, dh) == -1)
+			goto err;
+
+		free(key);
+		DH_free(dh);
+	}
+
+	return 0;
+
+err:
+	ERR_print_errors_fp(stderr);
+	return 1;
+}
-- 
cgit v1.2.3-55-g6feb