Skip to content

Commit 54f34b3

Browse files
committed
updated scripts to include util and use jdk18on
1 parent 4a62640 commit 54f34b3

File tree

4 files changed

+16
-44
lines changed

4 files changed

+16
-44
lines changed

test/est/example/cacerts.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@ popd
77

88
$DIR/ensurejar.sh
99

10-
CP="$DIR/jars/pkix.jar:$DIR/jars/bcprov.jar:$DIR/jars/test.jar:$DIR/jars/bctls.jar"
10+
CP="$DIR/jars/util.jar:$DIR/jars/pkix.jar:$DIR/jars/bcprov.jar:$DIR/jars/test.jar:$DIR/jars/bctls.jar"
1111
java -classpath $CP org.bouncycastle.test.est.examples.CaCertsExample --sl $DIR/jars/suffixlist.dat $@
1212

test/est/example/enroll.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@ popd
77

88
$DIR/ensurejar.sh
99

10-
CP="$DIR/jars/pkix.jar:$DIR/jars/bcprov.jar:$DIR/jars/test.jar:$DIR/jars/bctls.jar"
10+
CP="$DIR/jars/util.jar:$DIR/jars/pkix.jar:$DIR/jars/bcprov.jar:$DIR/jars/test.jar:$DIR/jars/bctls.jar"
1111
echo $CP
1212
java -classpath $CP org.bouncycastle.test.est.examples.EnrollExample --sl $DIR/jars/suffixlist.dat $@

test/est/example/ensurejar.sh

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,15 @@ popd
1717
pushd $DIR/jars
1818

1919
curl -o ver.index https://downloads.bouncycastle.org/betas/index.html
20-
bcver=`fgrep bcprov-ext ver.index | fgrep .jar | sed -e "s:^.*bcprov-ext-jdk15on-::" | sed -e "s:.jar<.*$::"`
20+
bcver=`fgrep bcprov-ext ver.index | fgrep .jar | sed -e "s:^.*bcprov-ext-jdk18on-::" | sed -e "s:.jar<.*$::"`
2121

2222
if type curl > /dev/null; then
23-
curl -o bcprov.jar https://downloads.bouncycastle.org/betas/bcprov-jdk15on-$bcver.jar
24-
curl -o bctls.jar https://downloads.bouncycastle.org/betas/bctls-jdk15on-$bcver.jar
23+
curl -o bcprov.jar https://downloads.bouncycastle.org/betas/bcprov-jdk18on-$bcver.jar
24+
curl -o bctls.jar https://downloads.bouncycastle.org/betas/bctls-jdk18on-$bcver.jar
2525
curl -o suffixlist.dat https://www.publicsuffix.org/list/public_suffix_list.dat
2626
elif type wget > /dev/null ; then
27-
wget -O bcprov.jar https://downloads.bouncycastle.org/betas/bcprov-jdk15on-$bcver.jar
28-
wget -O bctls.jar https://downloads.bouncycastle.org/betas/bctls-jdk15on-$bcver.jar
27+
wget -O bcprov.jar https://downloads.bouncycastle.org/betas/bcprov-jdk18on-$bcver.jar
28+
wget -O bctls.jar https://downloads.bouncycastle.org/betas/bctls-jdk18on-$bcver.jar
2929
wget -O suffixlist.dat https://www.publicsuffix.org/list/public_suffix_list.dat
3030
else
3131
echo "No wget or curl to download provider jar"
@@ -40,6 +40,7 @@ gradle -x test clean jar
4040

4141
cp $BCDIR/test/build/libs/test-*.jar $DIR/jars/test.jar
4242
cp $BCDIR/pkix/build/libs/bcpkix-*.jar $DIR/jars/pkix.jar
43+
cp $BCDIR/util/build/libs/bcutil-*.jar $DIR/jars/util.jar
4344

4445
fi
4546

test/est/example/server.ta.pem

Lines changed: 8 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,10 @@
11
-----BEGIN CERTIFICATE-----
2-
MIIGxDCCBKygAwIBAgIUdRcWd4PQQ361VsNXlG5FY7jr06wwDQYJKoZIhvcNAQEL
3-
BQAwRTELMAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxGzAZ
4-
BgNVBAMTElF1b1ZhZGlzIFJvb3QgQ0EgMjAeFw0xMzEyMTcxNDI1MTBaFw0yMzEy
5-
MTcxNDI1MTBaMF4xCzAJBgNVBAYTAlVTMTAwLgYDVQQKEydIeWRyYW50SUQgKEF2
6-
YWxhbmNoZSBDbG91ZCBDb3Jwb3JhdGlvbikxHTAbBgNVBAMTFEh5ZHJhbnRJRCBT
7-
U0wgSUNBIEcyMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA9p1ZOA9+
8-
H+tgdln+STF7bdOxvnOERYyjo8ZbKumzigNePSwbQYVWuso76GI843yjaX2rhn0+
9-
Jt0NVJM41jVctf9qwacVduR7CEi0qJgpAUJyZUuB9IpFWF1Kz14O3Leh6URuRZ43
10-
RzHaRmNtzkxttGBuOtAg+ilOuwiGAo9VQLgdONlqQFcrbp97/fO8ZIqiPrbhLxCZ
11-
fXkYi3mktZVRFKXG62FHAuH1sLDXCKba3avDcUR7ykG4ZXcmp6kl14UKa8JHOHPE
12-
NYyr0R6oHELOGZMox1nQcFwuYMX9sJdAUU/9SQVXyA6u6YtxlpZiC8qhXM1IE00T
13-
Q9+q5ppffSUDMC4V/5If5A6snKVP78M8qd/RMVswcjMUMEnov+wykwCbDLD+IReM
14-
A57XX+HojN+8XFTL9Jwge3z3ZlMwL7E54W3cI7f6cxO5DVwoKxkdk2jRIg37oqSl
15-
SU3z/bA9UXjHcTl/6BoLho2p9rWm6oljANPeQuLHyGJ3hc19N8nDo2IATp70klGP
16-
kd1qhIgrdkki7gBpanMOK98hKMpdQgs+NY4DkaMJqfrHzWR/CYkdyUCivFaepaFS
17-
K78+jVu1oCMOFOnucPXL2fQa3VQn+69+7mA324frjwZj9NzrHjd0a5UP7waPpd9W
18-
2jZoj4b+g+l+XU1SQ+9DWiuZtvfDW++k0BMCAwEAAaOCAZEwggGNMBIGA1UdEwEB
19-
/wQIMAYBAf8CAQAweAYDVR0gBHEwbzAIBgZngQwBAgEwCAYGZ4EMAQICMA4GDCsG
20-
AQQBvlgAAmQBAjBJBgwrBgEEAb5YAAOHBAAwOTA3BggrBgEFBQcCARYraHR0cDov
21-
L3d3dy5oeWRyYW50aWQuY29tL3N1cHBvcnQvcmVwb3NpdG9yeTByBggrBgEFBQcB
22-
AQRmMGQwKgYIKwYBBQUHMAGGHmh0dHA6Ly9vY3NwLnF1b3ZhZGlzZ2xvYmFsLmNv
23-
bTA2BggrBgEFBQcwAoYqaHR0cDovL3RydXN0LnF1b3ZhZGlzZ2xvYmFsLmNvbS9x
24-
dnJjYTIuY3J0MA4GA1UdDwEB/wQEAwIBBjAfBgNVHSMEGDAWgBQahGK8SEwzJQTU
25-
7tD2A8QZRtGUazA5BgNVHR8EMjAwMC6gLKAqhihodHRwOi8vY3JsLnF1b3ZhZGlz
26-
Z2xvYmFsLmNvbS9xdnJjYTIuY3JsMB0GA1UdDgQWBBSYarYtLr+nqp/299YJr9WL
27-
V/mKtzANBgkqhkiG9w0BAQsFAAOCAgEAlraik8EDDUkpAnIOajO9/r4dpj/Zry76
28-
6SH1oYPo7eTGzpDanPMeGMuSmwdjUkFUPALuWwkaDERfz9xdyFL3N8CRg9mQhdtT
29-
3aWQUv/iyXULXT87EgL3b8zzf8fhTS7r654m9WM2W7pFqfimx9qAlFe9XcVlZrUu
30-
9hph+/MfWMrUju+VPL5U7hZvUpg66mS3BaN15rsXv2+Vw6kQsQC/82iJLHvtYVL/
31-
LwbNio18CsinDeyRE0J9wlYDqzcg5rhD0rtX4JEmBzq8yBRvHIB/023o/vIO5oxh
32-
83Hic/2Xgwksf1DKS3/z5nTzhsUIpCpwkN6nHp6gmA8JBXoUlKQz4eYHJCq/ZyC+
33-
BuY2vHpNx6101J5dmy7ps7J7d6mZXzguP3DQN84hjtfwJPqdf+/9RgLriXeFTqwe
34-
snxbk2FsPhwxhiNOH98GSZVvG02v10uHLVaf9B+puYpoUiEqgm1WG5mWW1PxHstu
35-
Ew9jBMcJ6wjQc8He9rSUmrhBr0HyhckdC99RgEvpcZpV2XL4nPPrTI2ki/c9xQb9
36-
kmhVGonSXy5aP+hDC+Ht+bxmc4wN5x+vB02hak8Hh8jIUStRxOsRfJozU0R9ysyP
37-
EZAHFZ3Zivg2BaD4tOISO8/T2FDjG7PNUv0tgPAOKw2t94B+1evrSUhqJDU0Wf9c
38-
9vkaKoPvX4w=
2+
MIIBVDCB+qADAgECAgkAq+gy4fZqa0MwCgYIKoZIzj0EAwIwFzEVMBMGA1UEAxMM
3+
ZXN0RXhhbXBsZUNBMB4XDTIxMDkwMTE4MjE0MFoXDTMxMDgzMDE4MjE0MFowFzEV
4+
MBMGA1UEAxMMZXN0RXhhbXBsZUNBMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE
5+
JrLC3kdCWjorNfjmVw6ERgVt5wtFAW0CdlP11PvxrGEHTwsBEXGI7By1JzkFTnAV
6+
e/dUgWT0QC5VLrgiUw+XJaMvMC0wDAYDVR0TBAUwAwEB/zAdBgNVHQ4EFgQUGt85
7+
hMJW5mzPKrQmpf0M0kP1PT4wCgYIKoZIzj0EAwIDSQAwRgIhAJP0XbZh/gtmeahq
8+
nIGPBEFv4e8ZADMUYqCl3dywKqiJAiEAoZA5SzJmg/IEmrledlPbAOb/xkeLq3sl
9+
qsKtsgutA7w=
3910
-----END CERTIFICATE-----

0 commit comments

Comments
 (0)