From ecd8c27ddc8ea1a874e411b5840ac224c9e33edd Mon Sep 17 00:00:00 2001
From: guenther <guenther@openbsd.org>
Date: Thu, 22 May 2014 03:36:23 +0000
Subject: [PATCH] Make this build cleanly even with UTF8_{putc,getc} moved from
 the public header to the internal.  Make some variables unsigned to eliminate
 some warnings

---
 regress/lib/libcrypto/utf8/Makefile   | 4 +++-
 regress/lib/libcrypto/utf8/utf8test.c | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/regress/lib/libcrypto/utf8/Makefile b/regress/lib/libcrypto/utf8/Makefile
index 4940e600503..8c9f5f8a958 100644
--- a/regress/lib/libcrypto/utf8/Makefile
+++ b/regress/lib/libcrypto/utf8/Makefile
@@ -1,7 +1,9 @@
-#	$OpenBSD: Makefile,v 1.1 2014/05/18 22:04:14 guenther Exp $
+#	$OpenBSD: Makefile,v 1.2 2014/05/22 03:36:23 guenther Exp $
 
 PROG=	utf8test
+CPPFLAGS+=-I${.CURDIR}/../../../../lib/libssl/src/crypto/asn1
 LDADD=	-lcrypto
 DPADD=	${LIBCRYPTO}
+WARNINGS=Yes
 
 .include <bsd.regress.mk>
diff --git a/regress/lib/libcrypto/utf8/utf8test.c b/regress/lib/libcrypto/utf8/utf8test.c
index 453ab43a408..5da5709746b 100644
--- a/regress/lib/libcrypto/utf8/utf8test.c
+++ b/regress/lib/libcrypto/utf8/utf8test.c
@@ -23,6 +23,7 @@
 #include <err.h>
 
 #include <openssl/asn1.h>
+#include "asn1_locl.h"		/* peek into the internals */
 
 #define	UNCHANGED	0xfedcba98
 
@@ -39,7 +40,8 @@ main(void)
 	unsigned char testbuf[] = "012345";
 	const unsigned char zerobuf[sizeof testbuf] = { 0 };
 	unsigned long value;
-	int i, j, k, l, ret;
+	unsigned int i, j, k, l;
+	int ret;
 
 	/*
 	 * First, verify UTF8_getc()
-- 
2.20.1