Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 57da6efb authored by Steve Kondik's avatar Steve Kondik
Browse files

Don't crash if no CA is specified.

parent fdd48ef7

packages/VpnServices/src/com/android/server/vpn/OpenvpnService.java

+7 −3
Original line number Diff line number Diff line
@@ -66,9 +66,13 @@ class OpenvpnService extends VpnService<OpenvpnProfile> { 
	args.add("--proto"); args.add(p.getProto());

	args.add("--client");

	args.add("--rport"); args.add(p.getPort());

	if (p.getCAName() != null) {

		args.add("--ca"); args.add(USE_INLINE); args.add(USE_KEYSTORE + Credentials.CA_CERTIFICATE + p.getCAName());

	}

	if (p.getCertName() != null) {

		args.add("--cert"); args.add(USE_INLINE); args.add(USE_KEYSTORE + Credentials.USER_CERTIFICATE + p.getCertName());

		args.add("--key"); args.add(USE_INLINE); args.add(USE_KEYSTORE + Credentials.USER_PRIVATE_KEY + p.getCertName());

	}

	args.add("--persist-tun");

	args.add("--persist-key");

	args.add("--management"); args.add("/dev/socket/" + socketName); args.add("unix");