JNI: add TLS 1.3 version to example Client.java and Server.java
parent
8087699d79
commit
5146e74c4d
|
@ -112,7 +112,7 @@ public class Client {
|
||||||
if (args.length < i+2)
|
if (args.length < i+2)
|
||||||
printUsage();
|
printUsage();
|
||||||
sslVersion = Integer.parseInt(args[++i]);
|
sslVersion = Integer.parseInt(args[++i]);
|
||||||
if (sslVersion < 0 || sslVersion > 3) {
|
if (sslVersion < 0 || sslVersion > 4) {
|
||||||
printUsage();
|
printUsage();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -238,6 +238,9 @@ public class Client {
|
||||||
case 3:
|
case 3:
|
||||||
method = WolfSSL.TLSv1_2_ClientMethod();
|
method = WolfSSL.TLSv1_2_ClientMethod();
|
||||||
break;
|
break;
|
||||||
|
case 4:
|
||||||
|
method = WolfSSL.TLSv1_3_ClientMethod();
|
||||||
|
break;
|
||||||
case -1:
|
case -1:
|
||||||
method = WolfSSL.DTLSv1_ClientMethod();
|
method = WolfSSL.DTLSv1_ClientMethod();
|
||||||
break;
|
break;
|
||||||
|
@ -726,7 +729,7 @@ public class Client {
|
||||||
System.out.println("-h <host>\tHost to connect to, default 127.0.0.1");
|
System.out.println("-h <host>\tHost to connect to, default 127.0.0.1");
|
||||||
System.out.println("-p <num>\tPort to connect to, default 11111");
|
System.out.println("-p <num>\tPort to connect to, default 11111");
|
||||||
System.out.println("-v <num>\tSSL version [0-3], SSLv3(0) - " +
|
System.out.println("-v <num>\tSSL version [0-3], SSLv3(0) - " +
|
||||||
"TLS1.2(3)), default 3");
|
"TLS1.3(4)), default 3");
|
||||||
System.out.println("-l <str>\tCipher list");
|
System.out.println("-l <str>\tCipher list");
|
||||||
System.out.println("-c <file>\tCertificate file,\t\tdefault " +
|
System.out.println("-c <file>\tCertificate file,\t\tdefault " +
|
||||||
"../certs/client-cert.pem");
|
"../certs/client-cert.pem");
|
||||||
|
|
|
@ -106,7 +106,7 @@ public class Server {
|
||||||
if (args.length < i+2)
|
if (args.length < i+2)
|
||||||
printUsage();
|
printUsage();
|
||||||
sslVersion = Integer.parseInt(args[++i]);
|
sslVersion = Integer.parseInt(args[++i]);
|
||||||
if (sslVersion < 0 || sslVersion > 3) {
|
if (sslVersion < 0 || sslVersion > 4) {
|
||||||
printUsage();
|
printUsage();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -238,6 +238,9 @@ public class Server {
|
||||||
case 3:
|
case 3:
|
||||||
method = WolfSSL.TLSv1_2_ServerMethod();
|
method = WolfSSL.TLSv1_2_ServerMethod();
|
||||||
break;
|
break;
|
||||||
|
case 4:
|
||||||
|
method = WolfSSL.TLSv1_3_ServerMethod();
|
||||||
|
break;
|
||||||
case -1:
|
case -1:
|
||||||
method = WolfSSL.DTLSv1_ServerMethod();
|
method = WolfSSL.DTLSv1_ServerMethod();
|
||||||
break;
|
break;
|
||||||
|
@ -649,7 +652,7 @@ public class Server {
|
||||||
System.out.println("-?\t\tHelp, print this usage");
|
System.out.println("-?\t\tHelp, print this usage");
|
||||||
System.out.println("-p <num>\tPort to connect to, default 11111");
|
System.out.println("-p <num>\tPort to connect to, default 11111");
|
||||||
System.out.println("-v <num>\tSSL version [0-3], SSLv3(0) - " +
|
System.out.println("-v <num>\tSSL version [0-3], SSLv3(0) - " +
|
||||||
"TLS1.2(3)), default 3");
|
"TLS1.3(4)), default 3");
|
||||||
System.out.println("-l <str>\tCipher list");
|
System.out.println("-l <str>\tCipher list");
|
||||||
System.out.println("-c <file>\tCertificate file,\t\tdefault " +
|
System.out.println("-c <file>\tCertificate file,\t\tdefault " +
|
||||||
"../certs/client-cert.pem");
|
"../certs/client-cert.pem");
|
||||||
|
|
Loading…
Reference in New Issue