rpms/crypto-utils/devel Makefile,1.4,1.5

[Elio Maldonado (emaldonado)]

Author: emaldonado

Update of /cvs/extras/rpms/crypto-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2997

Modified Files:
	Makefile 
Log Message:
Use nss library for cryptography (#346731)


Index: Makefile
===================================================================
RCS file: /cvs/extras/rpms/crypto-utils/devel/Makefile,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Makefile	24 Oct 2007 14:03:17 -0000	1.4
+++ Makefile	1 May 2008 01:24:19 -0000	1.5
@@ -20,13 +20,19 @@
 
 include $(MAKEFILE_COMMON)
 
-certwatch: certwatch.c
-	gcc -Wall -Werror -O2 -g $< -o $@ -lcrypto
+certwatch: certwatch.c pemutil.c
+	gcc -Wall -Werror -O2 -g $^ -o $@  \
+		-lnspr4 -lnss3 -I/usr/include/nspr4 -I/usr/include/nss3
 
 test-certwatch: certwatch
 	./certwatch
 
-genkey: genkey.pl Makefile
+keyutil: keyutil.c keyutil.h certext.c secutil.c secutil.h secerror.c
+	gcc -Wall -Werror -O2 -g $^ -o $@ \
+		-lnspr4 -lnss3 -I/usr/include/nspr4 -I/usr/include/nss3
+	chmod 755 $@
+
+genkey: genkey.pl keyutil Makefile
 	sed -e "s|^\$$bindir.*$$|\$$bindir = \"/usr/bin\";|" \
 	    -e "s|^\$$ssltop.*$$|\$$ssltop = \"$(PWD)\";|" \
 	    -e "s|^\$$sslconf.*$$|\$$sslconf = \"/etc/pki/tls/openssl.cnf\";|" \
@@ -40,6 +46,37 @@
 	mkdir -p certs private
 	./genkey --test `hostname`
 
+test-genkey-modnss: genkey
+	mkdir -p certs private
+	./genkey --test --nss test.`hostname`
+
+#########################################################################
+# The following test targets run genkey with debug tracing on, which 
+# creates temporary files, and the nss utilities with gdb. Use the
+# cleanup-tests to help clean up after yourself. The -modnss targets may
+# need to be run as super user in order to access the database.
+#########################################################################
+
+test-genreq-modssl: genkey
+	perl ./genkey --genreq -d test.`hostname`
+			
+test-makecert-modssl: genkey
+	perl ./genkey --makeca -d test.`hostname`
+
+test-genreq-modnss: genkey
+	perl ./genkey --genreq -d -n test.`hostname`
+
+test-makecert-modnss: genkey
+	perl ./genkey --makeca -d -n test.`hostname`
+
+prepare-tests:
+	mkdir -p certs private
+
+cleanup-tests: certs private
+	rm -f -r certs private
+
+#########################################################################
+	
 date.xml:
 	date +"%e %B %Y" | tr -d '\n' > $@