From 93754dc5cfb68199b659180bbac77eecd6636c28 Mon Sep 17 00:00:00 2001
From: Brent Cook <bcook@openbsd.org>
Date: Tue, 24 Jan 2017 06:06:07 -0600
Subject: initial ocspcheck integration

---
 .gitignore                    |  5 +++++
 apps/Makefile.am              |  2 +-
 apps/ocspcheck/CMakeLists.txt | 24 ++++++++++++++++++++++++
 apps/ocspcheck/Makefile.am    | 15 +++++++++++++++
 configure.ac                  |  1 +
 update.sh                     | 25 ++++++++++++++++++-------
 6 files changed, 64 insertions(+), 8 deletions(-)
 create mode 100644 apps/ocspcheck/CMakeLists.txt
 create mode 100644 apps/ocspcheck/Makefile.am

diff --git a/.gitignore b/.gitignore
index 9a6fc22..be9af01 100644
--- a/.gitignore
+++ b/.gitignore
@@ -117,10 +117,15 @@ include/pqueue.h
 include/tls.h
 include/openssl/*.h
 
+/apps/ocspcheck/*.h
+/apps/ocspcheck/*.c
+/apps/ocspcheck/ocspcheck*
+
 /apps/nc/*.h
 /apps/nc/*.c
 /apps/nc/nc*
 !/apps/nc/readpassphrase.c
+
 /apps/openssl/*.h
 /apps/openssl/*.c
 /apps/openssl/*.cnf
diff --git a/apps/Makefile.am b/apps/Makefile.am
index 60d0c60..b512a1c 100644
--- a/apps/Makefile.am
+++ b/apps/Makefile.am
@@ -1,5 +1,5 @@
 include $(top_srcdir)/Makefile.am.common
 
-SUBDIRS = openssl nc
+SUBDIRS = ocspcheck openssl nc
 
 EXTRA_DIST = CMakeLists.txt
diff --git a/apps/ocspcheck/CMakeLists.txt b/apps/ocspcheck/CMakeLists.txt
new file mode 100644
index 0000000..87a22d2
--- /dev/null
+++ b/apps/ocspcheck/CMakeLists.txt
@@ -0,0 +1,24 @@
+include_directories(
+	.
+	./compat
+	../../include
+	../../include/compat
+)
+
+set(
+	OCSPCHECK_SRC
+	http.c
+	ocspcheck.c
+)
+
+if(NOT "${OPENSSLDIR}" STREQUAL "")
+	add_definitions(-DDEFAULT_CA_FILE=\"${OPENSSLDIR}/cert.pem\")
+else()
+	add_definitions(-DDEFAULT_CA_FILE=\"${CMAKE_INSTALL_PREFIX}/etc/ssl/cert.pem\")
+endif()
+
+add_executable(ocspcheck ${OCSPCHECK_SRC})
+target_link_libraries(ocspcheck tls ${OPENSSL_LIBS})
+
+install(TARGETS ocspcheck DESTINATION bin)
+install(FILES ocspcheck.8 DESTINATION share/man/man8)
diff --git a/apps/ocspcheck/Makefile.am b/apps/ocspcheck/Makefile.am
new file mode 100644
index 0000000..2f6540d
--- /dev/null
+++ b/apps/ocspcheck/Makefile.am
@@ -0,0 +1,15 @@
+include $(top_srcdir)/Makefile.am.common
+
+bin_PROGRAMS = ocspcheck
+
+EXTRA_DIST = ocspcheck.8
+EXTRA_DIST += CMakeLists.txt
+
+ocspcheck_LDADD = $(abs_top_builddir)/crypto/libcrypto.la
+ocspcheck_LDADD += $(abs_top_builddir)/ssl/libssl.la
+ocspcheck_LDADD += $(abs_top_builddir)/tls/libtls.la
+ocspcheck_LDADD += $(PLATFORM_LDADD) $(PROG_LDADD)
+
+ocspcheck_SOURCES = http.c
+ocspcheck_SOURCES += ocspcheck.c
+noinst_HEADERS = http.h
diff --git a/configure.ac b/configure.ac
index d1ad543..eecfb41 100644
--- a/configure.ac
+++ b/configure.ac
@@ -128,6 +128,7 @@ AC_CONFIG_FILES([
 	tls/Makefile
 	tests/Makefile
 	apps/Makefile
+	apps/ocspcheck/Makefile
 	apps/openssl/Makefile
 	apps/nc/Makefile
 	man/Makefile
diff --git a/update.sh b/update.sh
index 9a9dd5e..5295bf4 100755
--- a/update.sh
+++ b/update.sh
@@ -26,7 +26,8 @@ libssl_src=$CWD/openbsd/src/lib/libssl
 libssl_regress=$CWD/openbsd/src/regress/lib/libssl
 libtls_src=$CWD/openbsd/src/lib/libtls
 libtls_regress=$CWD/openbsd/src/regress/lib/libtls
-app_src=$CWD/openbsd/src/usr.bin
+bin_src=$CWD/openbsd/src/usr.bin
+sbin_src=$CWD/openbsd/src/usr.sbin
 
 # load library versions
 . $libcrypto_src/shlib_version
@@ -216,25 +217,35 @@ sed -e "s/compat\///" crypto/Makefile.am.arc4random > \
 
 # copy nc(1) source
 echo "copying nc(1) source"
-$CP $app_src/nc/nc.1 apps/nc
+$CP $bin_src/nc/nc.1 apps/nc
 rm -f apps/nc/*.c apps/nc/*.h
 $CP_LIBC $libc_src/stdlib/strtonum.c apps/nc/compat
 for i in `awk '/SOURCES|HEADERS|MANS/ { print $3 }' apps/nc/Makefile.am` ; do
-	if [ -e $app_src/nc/$i ]; then
-		$CP $app_src/nc/$i apps/nc
+	if [ -e $bin_src/nc/$i ]; then
+		$CP $bin_src/nc/$i apps/nc
+	fi
+done
+
+# copy ocspcheck(1) source
+echo "copying ocspcheck(1) source"
+$CP $sbin_src/ocspcheck/ocspcheck.8 apps/ocspcheck
+rm -f apps/ocspcheck/*.c apps/ocspcheck/*.h
+for i in `awk '/SOURCES|HEADERS|MANS/ { print $3 }' apps/ocspcheck/Makefile.am` ; do
+	if [ -e $sbin_src/ocspcheck/$i ]; then
+		$CP $sbin_src/ocspcheck/$i apps/ocspcheck
 	fi
 done
 
 # copy openssl(1) source
 echo "copying openssl(1) source"
-$CP $app_src/openssl/openssl.1 apps/openssl
+$CP $bin_src/openssl/openssl.1 apps/openssl
 $CP_LIBC $libc_src/stdlib/strtonum.c apps/openssl/compat
 $CP $libcrypto_src/cert.pem apps/openssl
 $CP $libcrypto_src/openssl.cnf apps/openssl
 $CP $libcrypto_src/x509v3.cnf apps/openssl
 for i in `awk '/SOURCES|HEADERS|MANS/ { print $3 }' apps/openssl/Makefile.am` ; do
-	if [ -e $app_src/openssl/$i ]; then
-		$CP $app_src/openssl/$i apps/openssl
+	if [ -e $bin_src/openssl/$i ]; then
+		$CP $bin_src/openssl/$i apps/openssl
 	fi
 done
 
-- 
cgit v1.2.3-55-g6feb