X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=ea21aa0bf544e7b9de4c0112ddea6f73d8f7e477;hb=dce5ff3720ae5a4a9d26c1af1d9f1ef7cb16f04d;hp=68007d8ebf07d4533142e9b97e9aed732dcf1427;hpb=59c78980548b7753b76f416fbd91b5309fb55ba4;p=org.ibex.crypto.git

diff --git a/Makefile b/Makefile
index 68007d8..ea21aa0 100644
--- a/Makefile
+++ b/Makefile
@@ -2,6 +2,7 @@ JAVAC = javac
 sources = $(shell find src -name '*.java')
 classes = $(sources:src/%.java=build/%.class)
 dats = org/ibex/net/ssl/rootcerts.dat
+cacertificates_version = 20050518
 
 jar_sources = \
 	$(shell find src/org/ibex/crypto -name '*.java') \
@@ -34,19 +35,28 @@ clean:
 
 # This stuff is only for Brian to use 
 # We should probably verify this file somehow
-tmp/.havecacertrs:
+tmp/.havecacerts:
 	@mkdir -p tmp
-	wget -O - http://ftp.debian.org/debian/pool/main/c/ca-certificates/ca-certificates_20020323.tar.gz | gzip -dc | tar -C tmp -xf-
-	cd tmp/ca-certificates/mozilla && \
-		make all \
-		for f in *.pem; do \
+	wget -O - http://ftp.debian.org/debian/pool/main/c/ca-certificates/ca-certificates_$(cacertificates_version).tar.gz | gzip -dc | tar -C tmp -xf-
+	cd tmp/ca-certificates-$(cacertificates_version)/mozilla && \
+		make all; \
+		for f in *.crt; do \
 			openssl x509 -in "$$f" -out "$$f.der" -outform der; \
 		done
 	touch $@
 
-update-rootcerts: tmp/.havecacerts src/org/ibex/net/ssl/GenCompactCAList.java
-	java -cp build org.ibex.net.ssl.GenCompactCAList binary tmp/ca-certificates/mozilla/*.der > src/org/ibex/net/ssl/rootcerts.dat	
-	java -cp build org.ibex.net.ssl.GenCompactCAList class tmp/ca-certificates/mozilla/*.der > src/org/ibex/net/ssl/RootCerts.java
+tmp/.havebouncycastle:
+	@mkdir -p tmp
+	test -d tmp/lcrypto-jdk11-128 || wget -O - http://www.bouncycastle.org/download/lcrypto-jdk11-128.tar.gz | gzip -dc | tar -C tmp -xf -
+	javac -d build $(shell find tmp/lcrypto-jdk11-128/src -name '*.java' ! -path '*/test/*')
+	touch $@
+
+build/GenCompactCAList.class: tools/GenCompactCAList.java tmp/.havebouncycastle
+	javac -classpath build -d build $<
+
+update-rootcerts: tmp/.havecacerts build/GenCompactCAList.class
+	java -cp build GenCompactCAList binary tmp/ca-certificates-$(cacertificates_version)/mozilla/*.der > src/org/ibex/net/ssl/rootcerts.dat	
+	java -cp build GenCompactCAList class tmp/ca-certificates-$(cacertificates_version)/mozilla/*.der > src/org/ibex/net/ssl/RootCerts.java
 
 sizecheck:
 	@for c in $(jar_classes); do \