updated scripts to include util and use jdk18on

Author: dghgit

test/est/example/cacerts.sh

@@ -7,6 +7,6 @@ popd
 
 $DIR/ensurejar.sh
 
-CP="$DIR/jars/pkix.jar:$DIR/jars/bcprov.jar:$DIR/jars/test.jar:$DIR/jars/bctls.jar"
+CP="$DIR/jars/util.jar:$DIR/jars/pkix.jar:$DIR/jars/bcprov.jar:$DIR/jars/test.jar:$DIR/jars/bctls.jar"
 java -classpath $CP  org.bouncycastle.test.est.examples.CaCertsExample --sl $DIR/jars/suffixlist.dat $@
 

test/est/example/enroll.sh

@@ -7,6 +7,6 @@ popd
 
 $DIR/ensurejar.sh
 
-CP="$DIR/jars/pkix.jar:$DIR/jars/bcprov.jar:$DIR/jars/test.jar:$DIR/jars/bctls.jar"
+CP="$DIR/jars/util.jar:$DIR/jars/pkix.jar:$DIR/jars/bcprov.jar:$DIR/jars/test.jar:$DIR/jars/bctls.jar"
 echo $CP
 java -classpath $CP org.bouncycastle.test.est.examples.EnrollExample --sl $DIR/jars/suffixlist.dat $@

test/est/example/ensurejar.sh

@@ -17,15 +17,15 @@ popd
 pushd $DIR/jars
 
 curl -o ver.index  https://downloads.bouncycastle.org/betas/index.html
-bcver=`fgrep bcprov-ext ver.index | fgrep .jar | sed -e "s:^.*bcprov-ext-jdk15on-::" | sed -e "s:.jar<.*$::"`
+bcver=`fgrep bcprov-ext ver.index | fgrep .jar | sed -e "s:^.*bcprov-ext-jdk18on-::" | sed -e "s:.jar<.*$::"`
 
 if  type curl > /dev/null; then
-    curl -o bcprov.jar  https://downloads.bouncycastle.org/betas/bcprov-jdk15on-$bcver.jar
-    curl -o bctls.jar https://downloads.bouncycastle.org/betas/bctls-jdk15on-$bcver.jar
+    curl -o bcprov.jar  https://downloads.bouncycastle.org/betas/bcprov-jdk18on-$bcver.jar
+    curl -o bctls.jar https://downloads.bouncycastle.org/betas/bctls-jdk18on-$bcver.jar
     curl -o suffixlist.dat  https://www.publicsuffix.org/list/public_suffix_list.dat
 elif type wget > /dev/null ; then
-    wget -O bcprov.jar https://downloads.bouncycastle.org/betas/bcprov-jdk15on-$bcver.jar
-    wget -O bctls.jar https://downloads.bouncycastle.org/betas/bctls-jdk15on-$bcver.jar
+    wget -O bcprov.jar https://downloads.bouncycastle.org/betas/bcprov-jdk18on-$bcver.jar
+    wget -O bctls.jar https://downloads.bouncycastle.org/betas/bctls-jdk18on-$bcver.jar
     wget -O suffixlist.dat https://www.publicsuffix.org/list/public_suffix_list.dat
 else
     echo "No wget or curl to download provider jar"
@@ -40,6 +40,7 @@ gradle -x test clean jar
 
 cp $BCDIR/test/build/libs/test-*.jar $DIR/jars/test.jar
 cp $BCDIR/pkix/build/libs/bcpkix-*.jar $DIR/jars/pkix.jar
+cp $BCDIR/util/build/libs/bcutil-*.jar $DIR/jars/util.jar
 
 fi
 

test/est/example/server.ta.pem

@@ -1,39 +1,10 @@
 -----BEGIN CERTIFICATE-----
-MIIGxDCCBKygAwIBAgIUdRcWd4PQQ361VsNXlG5FY7jr06wwDQYJKoZIhvcNAQEL
-BQAwRTELMAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxGzAZ
-BgNVBAMTElF1b1ZhZGlzIFJvb3QgQ0EgMjAeFw0xMzEyMTcxNDI1MTBaFw0yMzEy
-MTcxNDI1MTBaMF4xCzAJBgNVBAYTAlVTMTAwLgYDVQQKEydIeWRyYW50SUQgKEF2
-YWxhbmNoZSBDbG91ZCBDb3Jwb3JhdGlvbikxHTAbBgNVBAMTFEh5ZHJhbnRJRCBT
-U0wgSUNBIEcyMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA9p1ZOA9+
-H+tgdln+STF7bdOxvnOERYyjo8ZbKumzigNePSwbQYVWuso76GI843yjaX2rhn0+
-Jt0NVJM41jVctf9qwacVduR7CEi0qJgpAUJyZUuB9IpFWF1Kz14O3Leh6URuRZ43
-RzHaRmNtzkxttGBuOtAg+ilOuwiGAo9VQLgdONlqQFcrbp97/fO8ZIqiPrbhLxCZ
-fXkYi3mktZVRFKXG62FHAuH1sLDXCKba3avDcUR7ykG4ZXcmp6kl14UKa8JHOHPE
-NYyr0R6oHELOGZMox1nQcFwuYMX9sJdAUU/9SQVXyA6u6YtxlpZiC8qhXM1IE00T
-Q9+q5ppffSUDMC4V/5If5A6snKVP78M8qd/RMVswcjMUMEnov+wykwCbDLD+IReM
-A57XX+HojN+8XFTL9Jwge3z3ZlMwL7E54W3cI7f6cxO5DVwoKxkdk2jRIg37oqSl
-SU3z/bA9UXjHcTl/6BoLho2p9rWm6oljANPeQuLHyGJ3hc19N8nDo2IATp70klGP
-kd1qhIgrdkki7gBpanMOK98hKMpdQgs+NY4DkaMJqfrHzWR/CYkdyUCivFaepaFS
-K78+jVu1oCMOFOnucPXL2fQa3VQn+69+7mA324frjwZj9NzrHjd0a5UP7waPpd9W
-2jZoj4b+g+l+XU1SQ+9DWiuZtvfDW++k0BMCAwEAAaOCAZEwggGNMBIGA1UdEwEB
-/wQIMAYBAf8CAQAweAYDVR0gBHEwbzAIBgZngQwBAgEwCAYGZ4EMAQICMA4GDCsG
-AQQBvlgAAmQBAjBJBgwrBgEEAb5YAAOHBAAwOTA3BggrBgEFBQcCARYraHR0cDov
-L3d3dy5oeWRyYW50aWQuY29tL3N1cHBvcnQvcmVwb3NpdG9yeTByBggrBgEFBQcB
-AQRmMGQwKgYIKwYBBQUHMAGGHmh0dHA6Ly9vY3NwLnF1b3ZhZGlzZ2xvYmFsLmNv
-bTA2BggrBgEFBQcwAoYqaHR0cDovL3RydXN0LnF1b3ZhZGlzZ2xvYmFsLmNvbS9x
-dnJjYTIuY3J0MA4GA1UdDwEB/wQEAwIBBjAfBgNVHSMEGDAWgBQahGK8SEwzJQTU
-7tD2A8QZRtGUazA5BgNVHR8EMjAwMC6gLKAqhihodHRwOi8vY3JsLnF1b3ZhZGlz
-Z2xvYmFsLmNvbS9xdnJjYTIuY3JsMB0GA1UdDgQWBBSYarYtLr+nqp/299YJr9WL
-V/mKtzANBgkqhkiG9w0BAQsFAAOCAgEAlraik8EDDUkpAnIOajO9/r4dpj/Zry76
-6SH1oYPo7eTGzpDanPMeGMuSmwdjUkFUPALuWwkaDERfz9xdyFL3N8CRg9mQhdtT
-3aWQUv/iyXULXT87EgL3b8zzf8fhTS7r654m9WM2W7pFqfimx9qAlFe9XcVlZrUu
-9hph+/MfWMrUju+VPL5U7hZvUpg66mS3BaN15rsXv2+Vw6kQsQC/82iJLHvtYVL/
-LwbNio18CsinDeyRE0J9wlYDqzcg5rhD0rtX4JEmBzq8yBRvHIB/023o/vIO5oxh
-83Hic/2Xgwksf1DKS3/z5nTzhsUIpCpwkN6nHp6gmA8JBXoUlKQz4eYHJCq/ZyC+
-BuY2vHpNx6101J5dmy7ps7J7d6mZXzguP3DQN84hjtfwJPqdf+/9RgLriXeFTqwe
-snxbk2FsPhwxhiNOH98GSZVvG02v10uHLVaf9B+puYpoUiEqgm1WG5mWW1PxHstu
-Ew9jBMcJ6wjQc8He9rSUmrhBr0HyhckdC99RgEvpcZpV2XL4nPPrTI2ki/c9xQb9
-kmhVGonSXy5aP+hDC+Ht+bxmc4wN5x+vB02hak8Hh8jIUStRxOsRfJozU0R9ysyP
-EZAHFZ3Zivg2BaD4tOISO8/T2FDjG7PNUv0tgPAOKw2t94B+1evrSUhqJDU0Wf9c
-9vkaKoPvX4w=
+MIIBVDCB+qADAgECAgkAq+gy4fZqa0MwCgYIKoZIzj0EAwIwFzEVMBMGA1UEAxMM
+ZXN0RXhhbXBsZUNBMB4XDTIxMDkwMTE4MjE0MFoXDTMxMDgzMDE4MjE0MFowFzEV
+MBMGA1UEAxMMZXN0RXhhbXBsZUNBMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE
+JrLC3kdCWjorNfjmVw6ERgVt5wtFAW0CdlP11PvxrGEHTwsBEXGI7By1JzkFTnAV
+e/dUgWT0QC5VLrgiUw+XJaMvMC0wDAYDVR0TBAUwAwEB/zAdBgNVHQ4EFgQUGt85
+hMJW5mzPKrQmpf0M0kP1PT4wCgYIKoZIzj0EAwIDSQAwRgIhAJP0XbZh/gtmeahq
+nIGPBEFv4e8ZADMUYqCl3dywKqiJAiEAoZA5SzJmg/IEmrledlPbAOb/xkeLq3sl
+qsKtsgutA7w=
 -----END CERTIFICATE-----