Skip to content

Commit ddb1150

Browse files
author
Antonis Tsakiridis
committed
Fixed #342: CertPathValidatorException: Trust anchor for certification path not found
1 parent bdd383a commit ddb1150

File tree

10 files changed

+40
-32
lines changed

10 files changed

+40
-32
lines changed

‎Examples/restcomm-helloworld/app/app.iml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -64,14 +64,6 @@
6464
<sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
6565
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
6666
<sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
67-
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
68-
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
69-
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
70-
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
71-
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
72-
<sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
73-
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
74-
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
7567
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
7668
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
7769
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
@@ -80,6 +72,14 @@
8072
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
8173
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
8274
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
75+
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
76+
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
77+
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
78+
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
79+
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
80+
<sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
81+
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
82+
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
8383
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
8484
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
8585
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/builds" />

‎Examples/restcomm-helloworld/app/src/main/java/com/telestax/restcomm_helloworld/MainActivity.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -190,6 +190,7 @@ public void onServiceDisconnected(ComponentName arg0)
190190
Log.i(TAG, "%% onServiceDisconnected");
191191
serviceBound = false;
192192
}
193+
193194
@Override
194195
public boolean onCreateOptionsMenu(Menu menu)
195196
{

‎Examples/restcomm-olympus/app/app.iml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,7 @@
106106
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-support" />
107107
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
108108
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
109+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
109110
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/reload-dex" />
110111
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
111112
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/restart-dex" />

‎Examples/restcomm-olympus/app/olympus-version.properties‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
#Fri Sep 16 13:19:58 EEST 2016
2-
VERSION_CODE=1211
1+
#Fri Sep 16 17:29:02 EEST 2016
2+
VERSION_CODE=1226

‎Examples/restcomm-olympus/app/src/main/java/org/restcomm/android/olympus/MainActivity.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -210,8 +210,9 @@ public void onServiceConnected(ComponentName className, IBinder service)
210210
//params.put(RCDevice.ParameterKeys.RESOURCE_SOUND_DECLINED, R.raw.user_provided_declined_sound);
211211
//params.put(RCDevice.ParameterKeys.RESOURCE_SOUND_MESSAGE, R.raw.user_provided_message_sound);
212212

213-
// This is for debugging purposes, not for release builds
214-
//params.put(RCDevice.ParameterKeys.SIGNALING_JAIN_SIP_LOGGING_ENABLED, prefs.getBoolean(RCDevice.ParameterKeys.SIGNALING_JAIN_SIP_LOGGING_ENABLED, true));
213+
// These are for debugging purposes, NOT for release builds!
214+
//params.put(RCDevice.ParameterKeys.DEBUG_JAIN_SIP_LOGGING_ENABLED, prefs.getBoolean(RCDevice.ParameterKeys.DEBUG_JAIN_SIP_LOGGING_ENABLED, true));
215+
//params.put(RCDevice.ParameterKeys.DEBUG_JAIN_DISABLE_CERTIFICATE_VERIFICATION, prefs.getBoolean(RCDevice.ParameterKeys.DEBUG_JAIN_DISABLE_CERTIFICATE_VERIFICATION, true));
215216

216217
if (!device.isInitialized()) {
217218
device.initialize(getApplicationContext(), params, this);

‎restcomm.android.sdk/restcomm-android-sdk-version.properties‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
#Fri Sep 16 14:06:30 EEST 2016
2-
VERSION_CODE=1227
1+
#Fri Sep 16 17:29:02 EEST 2016
2+
VERSION_CODE=1246

‎restcomm.android.sdk/restcomm.android.sdk.iml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -64,14 +64,6 @@
6464
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
6565
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
6666
<sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
67-
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
68-
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
69-
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
70-
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
71-
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
72-
<sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
73-
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
74-
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
7567
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
7668
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
7769
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
@@ -80,6 +72,14 @@
8072
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
8173
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
8274
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
75+
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
76+
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
77+
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
78+
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
79+
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
80+
<sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
81+
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
82+
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
8383
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotations" />
8484
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
8585
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />

‎restcomm.android.sdk/src/main/java/org/restcomm/android/sdk/RCDevice.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,8 @@ public static class ParameterKeys {
116116
public static final String SIGNALING_PASSWORD = "pref_sip_password";
117117
public static final String SIGNALING_SECURE_ENABLED = "signaling-secure";
118118
public static final String SIGNALING_LOCAL_PORT = "signaling-local-port";
119-
public static final String SIGNALING_JAIN_SIP_LOGGING_ENABLED = "jain-sip-logging-enabled";
119+
public static final String DEBUG_JAIN_SIP_LOGGING_ENABLED = "jain-sip-logging-enabled";
120+
public static final String DEBUG_JAIN_DISABLE_CERTIFICATE_VERIFICATION = "jain-sip-disable-certificate-verification";
120121
public static final String MEDIA_TURN_ENABLED = "turn-enabled";
121122
public static final String MEDIA_ICE_URL = "turn-url";
122123
public static final String MEDIA_ICE_USERNAME = "turn-username";

‎restcomm.android.sdk/src/main/java/org/restcomm/android/sdk/SignalingClient/JainSipClient/JainSipClient.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -181,10 +181,11 @@ public void open(String jobId, Context androidContext, HashMap<String, Object> c
181181
// the SIP stack is ready to support it
182182
String keystoreFilename = "restcomm-android.keystore";
183183
HashMap<String, String> securityParameters = JainSipSecurityHelper.generateKeystore(androidContext, keystoreFilename);
184-
JainSipSecurityHelper.setProperties(properties, securityParameters.get("keystore-path"), securityParameters.get("keystore-password"));
184+
JainSipSecurityHelper.setProperties(properties, securityParameters.get("keystore-path"), securityParameters.get("keystore-password"),
185+
(Boolean)configuration.get(RCDevice.ParameterKeys.DEBUG_JAIN_DISABLE_CERTIFICATE_VERIFICATION));
185186

186-
if (configuration.containsKey(RCDevice.ParameterKeys.SIGNALING_JAIN_SIP_LOGGING_ENABLED) &&
187-
(Boolean)configuration.get(RCDevice.ParameterKeys.SIGNALING_JAIN_SIP_LOGGING_ENABLED)) {
187+
if (configuration.containsKey(RCDevice.ParameterKeys.DEBUG_JAIN_SIP_LOGGING_ENABLED) &&
188+
(Boolean)configuration.get(RCDevice.ParameterKeys.DEBUG_JAIN_SIP_LOGGING_ENABLED)) {
188189
// You need 16 for logging traces. 32 for debug + traces.
189190
// Your code will limp at 32 but it is best for debugging.
190191
properties.setProperty("android.gov.nist.javax.sip.TRACE_LEVEL", "32");

‎restcomm.android.sdk/src/main/java/org/restcomm/android/sdk/SignalingClient/JainSipClient/JainSipSecurityHelper.java‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -185,12 +185,15 @@ public static X509Certificate generateCertificate(KeyPair pair)
185185
return certGen.generateX509Certificate(pair.getPrivate(), "BC");
186186
}
187187

188-
public static void setProperties(Properties properties, String keystorePath, String keystorePassword) {
189-
properties.setProperty( "javax.net.ssl.keyStore", keystorePath);
190-
properties.setProperty( "javax.net.ssl.trustStore", keystorePath);
191-
properties.setProperty( "javax.net.ssl.keyStorePassword", keystorePassword );
192-
properties.setProperty( "javax.net.ssl.keyStoreType", "bks" );
193-
properties.setProperty( "android.gov.nist.javax.sip.ENABLED_CIPHER_SUITES", "TLS_RSA_WITH_AES_128_CBC_SHA SSL_RSA_WITH_3DES_EDE_CBC_SHA" );
188+
public static void setProperties(Properties properties, String keystorePath, String keystorePassword, Boolean disableCertVerification) {
189+
properties.setProperty("javax.net.ssl.keyStore", keystorePath);
190+
properties.setProperty("javax.net.ssl.trustStore", keystorePath);
191+
properties.setProperty("javax.net.ssl.keyStorePassword", keystorePassword );
192+
properties.setProperty("javax.net.ssl.keyStoreType", "bks" );
193+
properties.setProperty("android.gov.nist.javax.sip.ENABLED_CIPHER_SUITES", "TLS_RSA_WITH_AES_128_CBC_SHA SSL_RSA_WITH_3DES_EDE_CBC_SHA" );
194+
if (disableCertVerification != null && disableCertVerification) {
195+
properties.setProperty("android.gov.nist.javax.sip.TLS_CLIENT_AUTH_TYPE", "DisabledAll");
196+
}
194197
}
195198

196199
}

0 commit comments

Comments
 (0)