X.509 changes

.gitignore

@@ -9,6 +9,7 @@
 /configure~
 /cups3.pc
 /Makedefs
+/cups/.testssl
 /cups/fuzzipp
 /cups/libcups.a
 /cups/libcups.dylib
@@ -23,6 +24,7 @@
 /cups/locale/
 /cups/rasterbench
 /cups/test.json
+/cups/test.log
 /cups/test.pwg
 /cups/test.raster
 /cups/testarray

Makedefs.in

@@ -49,14 +49,6 @@ INSTALL_LIB	=	$(INSTALL) -c -m 755
 INSTALL_MAN	=	$(INSTALL) -c -m 444
 
 
-#
-# Cross-compilation support: "local" target is used for any tools that are
-# built and run locally.
-#
-
-LOCALTARGET     =       @LOCALTARGET@
-
-
 #
 # Libraries...
 #

Makefile

@@ -1,7 +1,7 @@
 #
 # Top-level Makefile for libcups.
 #
-# Copyright © 2020-2022 by OpenPrinting
+# Copyright © 2020-2023 by OpenPrinting
 #
 # Licensed under Apache License v2.0.  See the file "LICENSE" for more
 # information.
@@ -100,6 +100,17 @@ uninstall:
 	done
 
 
+#
+# Build all unit tests...
+#
+
+unittests:	all
+	for dir in $(DIRS); do\
+		echo "======== unittests in $$dir ========";\
+		(cd $$dir ; $(MAKE) $(MFLAGS) unittests) || exit 1;\
+	done
+
+
 #
 # Test everything...
 #

configure

@@ -684,7 +684,6 @@ CC
 OPTIM
 DSOFLAGS
 CODE_SIGN
-LOCALTARGET
 host_os
 host_vendor
 host_cpu
@@ -745,7 +744,7 @@ enable_static
 enable_shared
 enable_debug
 enable_maintainer
-enable_sanitizer
+with_sanitizer
 with_dsoflags
 with_ldflags
 with_domainsocket
@@ -1386,13 +1385,14 @@ Optional Features:
   --disable-shared        do not install shared library
   --enable-debug          turn on debugging, default=no
   --enable-maintainer     turn on maintainer mode, default=no
-  --enable-sanitizer      build with AddressSanitizer, default=no
 
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
   --with-dnssd=LIBRARY    set DNS-SD library (auto, avahi, mdnsresponder)
   --with-tls=...          use gnutls or openssl/libressl for TLS support
+  --with-sanitizer        build with address, leak, memory, thread, or
+                          undefined sanitizer, default=no
   --with-dsoflags=...     Specify additional DSOFLAGS
   --with-ldflags=...      Specify additional LDFLAGS
   --with-domainsocket     set unix domain socket name
@@ -2558,20 +2558,6 @@ then :
 fi
 
 
-if test "$build" = "$host"
-then :
-
-    # No, build local targets
-    LOCALTARGET="local"
-
-else $as_nop
-
-    # Yes, don't build local targets
-    LOCALTARGET=""
-
-fi
-
-
 for ac_prog in codesign true
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
@@ -5217,12 +5203,24 @@ then :
   enableval=$enable_maintainer;
 fi
 
-# Check whether --enable-sanitizer was given.
-if test ${enable_sanitizer+y}
+
+# Check whether --with-sanitizer was given.
+if test ${with_sanitizer+y}
 then :
-  enableval=$enable_sanitizer;
+  withval=$with_sanitizer;
 fi
 
+if test "x$with_sanitizer" = x
+then :
+
+    with_sanitizer="address"
+
+elif test "$with_sanitizer" != address -a "$with_sanitizer" != leak -a "$with_sanitizer" != memory -a "$with_sanitizer" != no -a "$with_sanitizer" != thread -a "$with_sanitizer" != undefined
+then :
+
+    as_fn_error $? "Unsupported --with-sanitizer value \"$with_sanitizer\" specified." "$LINENO" 5
+
+fi
 
 if test x$enable_debug = xyes
 then :
@@ -5248,11 +5246,11 @@ WARNINGS=""
 if test -n "$GCC"
 then :
 
-    if test x$enable_sanitizer = xyes
+    if test x$with_sanitizer != xno
 then :
 
-	# Use -fsanitize=address with debugging...
-	OPTIM="$OPTIM -fsanitize=address"
+	# Use -fsanitize=FOO with debugging...
+	OPTIM="$OPTIM -fsanitize=$with_sanitizer"
 
 elif echo "$CPPFLAGS $CFLAGS" | grep -q _FORTIFY_SOURCE
 then :

configure.ac

@@ -46,15 +46,6 @@ AS_IF([test "x$host_os_version" = x], [
 
 
 dnl Determine whether we are cross-compiling...
-AS_IF([test "$build" = "$host"], [
-    # No, build local targets
-    LOCALTARGET="local"
-], [
-    # Yes, don't build local targets
-    LOCALTARGET=""
-])
-AC_SUBST([LOCALTARGET])
-
 AC_PATH_PROGS([CODE_SIGN], [codesign true])
 
 
@@ -463,7 +454,12 @@ AC_SUBST([LIBCUPS_STATIC])
 dnl Extra compiler options...
 AC_ARG_ENABLE([debug], AS_HELP_STRING([--enable-debug], [turn on debugging, default=no]))
 AC_ARG_ENABLE([maintainer], AS_HELP_STRING([--enable-maintainer], [turn on maintainer mode, default=no]))
-AC_ARG_ENABLE([sanitizer], AS_HELP_STRING([--enable-sanitizer], [build with AddressSanitizer, default=no]))
+AC_ARG_WITH([sanitizer], AS_HELP_STRING([--with-sanitizer], [build with address, leak, memory, thread, or undefined sanitizer, default=no]))
+AS_IF([test "x$with_sanitizer" = x], [
+    with_sanitizer="address"
+], [test "$with_sanitizer" != address -a "$with_sanitizer" != leak -a "$with_sanitizer" != memory -a "$with_sanitizer" != no -a "$with_sanitizer" != thread -a "$with_sanitizer" != undefined], [
+    AC_MSG_ERROR([Unsupported --with-sanitizer value "$with_sanitizer" specified.])
+])
 
 AS_IF([test x$enable_debug = xyes], [
     CSFLAGS=""
@@ -482,9 +478,9 @@ WARNINGS=""
 AC_SUBST([WARNINGS])
 
 AS_IF([test -n "$GCC"], [
-    AS_IF([test x$enable_sanitizer = xyes], [
-	# Use -fsanitize=address with debugging...
-	OPTIM="$OPTIM -fsanitize=address"
+    AS_IF([test x$with_sanitizer != xno], [
+	# Use -fsanitize=FOO with debugging...
+	OPTIM="$OPTIM -fsanitize=$with_sanitizer"
     ], [echo "$CPPFLAGS $CFLAGS" | grep -q _FORTIFY_SOURCE], [
         # Don't add _FORTIFY_SOURCE if it is already there
     ], [

cups/Makefile

@@ -74,6 +74,7 @@ TESTOBJS	= \
 		testjson.o \
 		testjwt.o \
 		testoptions.o \
+		testpwg.o \
 		testraster.o \
 		testtestpage.o \
 		testthreads.o \
@@ -83,7 +84,6 @@ OBJS	=	\
 		$(TESTOBJS)
 
 #		testlang.o \
-#		testpwg.o \
 
 
 #
@@ -156,13 +156,13 @@ UNITTARGETS =	\
 		testjson \
 		testjwt \
 		testoptions \
+		testpwg \
 		testraster \
 		testtestpage \
 		testthreads \
 		tlscheck
 
 #		testlang \
-#		testpwg \
 
 TARGETS	=	\
 		$(LIBTARGETS)
@@ -181,43 +181,69 @@ all:		$(TARGETS)
 
 test:		$(UNITTARGETS)
 	rm -f test.log
+	date >test.log
 	echo Running array API tests...
 	./testarray 2>>test.log
 #	if test `uname` != Darwin; then \
 #		echo Running CUPS API tests...; \
 #		./testcups 2>>test.log; \
 #	fi
+	echo ""
+	echo Running credentials API tests...
+	./testcreds 2>>test.log
+	echo ""
 	echo Running file API tests...
 	./testfile 2>>test.log
+	echo ""
 	echo Running form API tests...
 	./testform 2>>test.log
+#	echo ""
 #	echo Running cupsGetDests API tests...
 #	./testgetdests 2>>test.log
+	echo ""
 	echo Running hash API tests...
 	./testhash 2>>test.log
+	echo ""
 	echo Running HTTP API tests...
 	./testhttp 2>>test.log
+	echo ""
 	echo Running IPP API tests...
 	./testipp 2>>test.log
+	echo ""
 	echo Running internationalization API tests...
 	./testi18n 2>>test.log
+	echo ""
 	echo Running JSON API tests...
 	./testjson 2>>test.log
+	echo ""
 	echo Running JWT API tests...
 	./testjwt 2>>test.log
+	echo ""
 	echo Running option API tests...
 	./testoptions 2>>test.log
+	echo ""
+	echo Running PWG API tests...
+	./testpwg 2>>test.log
+	echo ""
 	echo Running raster API tests...
 	./testraster 2>>test.log
 	./testtestpage 2>>test.log
 
 fuzz:		$(UNITTARGETS)
 	echo Fuzzing IPP API...
 	./fuzzipp 2>fuzz.log
+	echo ""
 	echo Fuzzing JSON API...
 	AFL_I_DONT_CARE_ABOUT_MISSING_CRASHES=yes AFL_NO_UI=yes afl-fuzz -n -i json-afl-in -o json-afl-out -V 120  -- ./testjson 2>>fuzz.log
 
 
+#
+# Make unit tests...
+#
+
+unittests:	$(UNITTARGETS)
+
+
 #
 # Remove object and target files...
 #
@@ -572,8 +598,6 @@ testpwg:	testpwg.o $(LIBCUPS_STATIC) test.ppd
 	echo Linking $@...
 	$(CC) $(LDFLAGS) $(OPTIM) -o $@ testpwg.o $(LIBCUPS_STATIC) $(LIBS)
 	$(CODE_SIGN) $(CSFLAGS) $@
-	echo Running PWG API tests...
-	./testpwg test.ppd
 
 
 #
@@ -624,7 +648,7 @@ doc:
 	echo "Generating CUPS Programming Manual..."
 	$(RM) cupspm.xml
 	codedoc --section "Programming" --body cupspm.md cupspm.xml \
-		$(LIBOBJS:.o=.c) $(HEADERS) --coverimage cupspm.png \
+		$(LIBOBJS:.o=.c) tls-openssl.c $(HEADERS) --coverimage cupspm.png \
 		--epub ../doc/cupspm.epub
 	codedoc --section "Programming" --body cupspm.md \
 		cupspm.xml > ../doc/cupspm.html

cups/cups-private.h

@@ -76,8 +76,8 @@ typedef struct _cups_globals_s		/**** CUPS global state data ****/
 {
   /* Multiple places... */
   const char		*datadir,	// Data directory (CUPS_DATADIR environment var)
-			*sysconfig,	// System config files (CUPS_SERVERROOT environment var)
-			*userconfig;	// User-specific config files (various environment vars)
+			*sysconfig;	// System config files (CUPS_SERVERROOT environment var)
+  char			*userconfig;	// User-specific config files
 #ifndef _WIN32
 #define PW_BUF_SIZE 16384		/* As per glibc manual page */
   char			pw_buf[PW_BUF_SIZE];