summaryrefslogtreecommitdiff
path: root/regress/lib
diff options
context:
space:
mode:
authorPhilip Guenther <guenther@cvs.openbsd.org>2014-05-22 03:36:24 +0000
committerPhilip Guenther <guenther@cvs.openbsd.org>2014-05-22 03:36:24 +0000
commit70ec6cd8ebd91f758bd6e6ae612905f4935bd56b (patch)
tree9cef671faa7c508132a504a3eb35ecfa6f50fcab /regress/lib
parent1f97029df50073f980f9cff5e3bf3186a30bc2c6 (diff)
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
Diffstat (limited to 'regress/lib')
-rw-r--r--regress/lib/libcrypto/utf8/Makefile4
-rw-r--r--regress/lib/libcrypto/utf8/utf8test.c4
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()