Skip to content

Commit b4bb2d9

Browse files
cconloncconlon
committed
make example KeyStores more specific to certs/type contained, allows for more granular testing
1 parent da13eaf commit b4bb2d9

33 files changed

Lines changed: 271 additions & 109 deletions

‎examples/provider/ClientJSSE.java‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ public void run(String[] args) throws Exception {
9191

9292
/* cert info */
9393
String clientJKS = "../provider/client.jks";
94-
String caJKS = "../provider/client.jks";
94+
String caJKS = "../provider/ca-server.jks";
9595
String clientPswd = "wolfSSL test";
9696
String caPswd = "wolfSSL test";
9797

@@ -140,9 +140,6 @@ public void run(String[] args) throws Exception {
140140
cipherList = args[++i];
141141

142142
} else if (arg.equals("-c")) {
143-
if (args.length < i+2) {
144-
printUsage();
145-
}
146143
String[] tmp = args[++i].split(":");
147144
if (tmp.length != 2) {
148145
printUsage();
@@ -151,8 +148,6 @@ public void run(String[] args) throws Exception {
151148
clientPswd = tmp[1];
152149

153150
} else if (arg.equals("-A")) {
154-
if (args.length < i+2)
155-
printUsage();
156151
String[] tmp = args[++i].split(":");
157152
if (tmp.length != 2) {
158153
printUsage();
@@ -351,9 +346,9 @@ private void printUsage() {
351346
System.out.println("-setp <protocols> \tSet enabled protocols " +
352347
"e.g \"TLSv1.1 TLSv1.2\"");
353348
System.out.println("-c <file>:<password>\tCertificate/key JKS,\t\tdefault " +
354-
"../provider/rsa.jks:wolfSSL test");
349+
"../provider/client.jks:wolfSSL test");
355350
System.out.println("-A <file>:<password>\tCertificate/key CA JKS file,\tdefault " +
356-
"../provider/cacerts.jks:wolfSSL test");
351+
"../provider/ca-server.jks:wolfSSL test");
357352
System.out.println("-r Resume session");
358353
System.exit(1);
359354
}

‎examples/provider/ClientSSLSocket.java‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,12 +80,17 @@ public static void main(String[] args) {
8080

8181
try {
8282

83-
/* load wolfJSSE as provider */
84-
Security.addProvider(new WolfSSLProvider());
83+
/* load wolfJSSE as provider as top priority provider */
84+
Security.insertProviderAt(new WolfSSLProvider(), 1);
8585

8686
/* set up key and trust stores */
8787
ks = KeyStore.getInstance("JKS");
8888
ks.load(new FileInputStream(keyStorePath), keyStorePass);
89+
90+
/* NOTE: Some versions of Java/JDK do not have support for EC
91+
* certificate types. If run on one of those versions, this
92+
* example may fail with an ASN no signer error / -188. If that
93+
* is the case, try again using RSA certs and CA certs instead */
8994
ts = KeyStore.getInstance("JKS");
9095
ts.load(new FileInputStream(trustStorePath), trustStorePass);
9196

‎examples/provider/MultiThreadedSSLClient.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ public MultiThreadedSSLClient(String[] args) {
152152
Security.addProvider(new WolfSSLProvider());
153153

154154
String clientKS = "./examples/provider/client.jks";
155-
String clientTS = "./examples/provider/client.jks";
155+
String clientTS = "./examples/provider/ca-server.jks";
156156
String jkspass = "wolfSSL test";
157157
char[] passArr = jkspass.toCharArray();
158158

‎examples/provider/MultiThreadedSSLServer.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@
4545
public class MultiThreadedSSLServer
4646
{
4747
private char[] psw = "wolfSSL test".toCharArray();
48-
private String serverKS = "./examples/provider/rsa.jks";
49-
private String serverTS = "./examples/provider/client.jks";
48+
private String serverKS = "./examples/provider/server.jks";
49+
private String serverTS = "./examples/provider/ca-client.jks";
5050
private String jsseProv = "wolfJSSE";
5151
int serverPort = 11118;
5252

‎examples/provider/ServerJSSE.java‎

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,8 @@ public void run(String[] args) {
6161
boolean putEnabledProtocols = false; /* set enabled protocols */
6262

6363
/* cert info */
64-
String serverJKS = "../provider/rsa.jks";
65-
String caJKS = "../provider/client.jks";
64+
String serverJKS = "../provider/server.jks";
65+
String caJKS = "../provider/ca-client.jks";
6666
String serverPswd = "wolfSSL test";
6767
String caPswd = "wolfSSL test";
6868

@@ -119,9 +119,6 @@ public void run(String[] args) {
119119
cipherList = args[++i];
120120

121121
} else if (arg.equals("-c")) {
122-
if (args.length < i+2) {
123-
printUsage();
124-
}
125122
String[] tmp = args[++i].split(":");
126123
if (tmp.length != 2) {
127124
printUsage();
@@ -130,8 +127,6 @@ public void run(String[] args) {
130127
serverPswd = tmp[1];
131128

132129
} else if (arg.equals("-A")) {
133-
if (args.length < i+2)
134-
printUsage();
135130
String[] tmp = args[++i].split(":");
136131
if (tmp.length != 2) {
137132
printUsage();
@@ -300,9 +295,9 @@ private void printUsage() {
300295
System.out.println("-setp <protocols> \tSet enabled protocols " +
301296
"e.g \"TLSv1.1 TLSv1.2\"");
302297
System.out.println("-c <file>:<password>\tCertificate/key JKS,\t\tdefault " +
303-
"../provider/rsa.jks:wolfSSL test");
298+
"../provider/server.jks:\"wolfSSL test\"");
304299
System.out.println("-A <file>:<password>\tCertificate/key CA JKS file,\tdefault " +
305-
"../provider/cacerts.jks:wolfSSL test");
300+
"../provider/ca-client.jks:\"wolfSSL test\"");
306301
System.exit(1);
307302
}
308303

‎examples/provider/ThreadedSSLSocketClientServer.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,9 +151,9 @@ public ThreadedSSLSocketClientServer(String[] args) {
151151
Security.addProvider(new WolfSSLProvider());
152152

153153
String serverKS = "./examples/provider/server.jks";
154-
String serverTS = "./examples/provider/client.jks";
154+
String serverTS = "./examples/provider/ca-client.jks";
155155
String clientKS = "./examples/provider/client.jks";
156-
String clientTS = "./examples/provider/client.jks";
156+
String clientTS = "./examples/provider/ca-server.jks";
157157
String pass = "wolfSSL test";
158158

159159
ServerThread server = new ServerThread(

‎examples/provider/all.jks‎

0 Bytes
Binary file not shown.

‎examples/provider/all_mixed.jks‎

1 Byte
Binary file not shown.

‎examples/provider/ca-client.jks‎

3.69 KB
Binary file not shown.

‎examples/provider/ca-server.jks‎

3.46 KB
Binary file not shown.

0 commit comments

Comments
 (0)