Merge pull request #16 from smartdevicelink/release/1.3.0

Release 1.3.0
smartdevicelink · Apr 21, 2021 · 8160eb7 · 8160eb7
2 parents 6e463ed + ebebe1d
commit 8160eb7
Show file tree

Hide file tree

Showing 11 changed files with 29 additions and 73 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,9 +1,7 @@
-# 1.2.0 Release Notes
+# 1.3.0 Release Notes
 
 ## Enhancements:
 
-- [Certificate issuer and date are not verified](https://github.com/smartdevicelink/sdl_security_java_suite/issues/2)
-- [Move constants to Java files to avoid recompiling Native layer](https://github.com/smartdevicelink/sdl_security_java_suite/issues/8)
-- [Sdl java suite should be updated to 5.0.0](https://github.com/smartdevicelink/sdl_security_java_suite/issues/10)
-- [Use AndroidX](https://github.com/smartdevicelink/sdl_security_java_suite/issues/11)
+- [Regenerate certs in resources to be compatible with Ubuntu 20](https://github.com/smartdevicelink/sdl_security_java_suite/issues/14)
+- [Sdl java suite should be updated to 5.1.0](https://github.com/smartdevicelink/sdl_security_java_suite/issues/15)
 
diff --git a/SdlSecurity/build.gradle b/SdlSecurity/build.gradle
@@ -4,7 +4,7 @@ buildscript {
     repositories {
         google()
         jcenter()
-
+        mavenCentral()
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:4.0.2'
@@ -18,7 +18,7 @@ allprojects {
     repositories {
         google()
         jcenter()
-
+        mavenCentral()
     }
 }
 

diff --git a/SdlSecurity/sdl_security/build.gradle b/SdlSecurity/sdl_security/build.gradle
@@ -1,14 +1,13 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 29
-
+    compileSdkVersion 30
 
     defaultConfig {
         minSdkVersion 26
-        targetSdkVersion 29
-        versionCode 2
-        versionName "1.2.0"
+        targetSdkVersion 30
+        versionCode 3
+        versionName "1.3.0"
 
         ndk {
             moduleName "ssl"
@@ -35,5 +34,5 @@ android {
 dependencies {
     api fileTree(dir: 'libs', include: ['*.jar'])
     api 'androidx.appcompat:appcompat:1.2.0'
-    api 'com.smartdevicelink:sdl_android:5.0.0'
+    api 'com.smartdevicelink:sdl_android:5.1.0'
 }
diff --git a/SdlSecurity/sdl_security/src/main/java/com/smartdevicelink/sdlsecurity/Constants.java b/SdlSecurity/sdl_security/src/main/java/com/smartdevicelink/sdlsecurity/Constants.java
@@ -10,7 +10,7 @@
  * Created by Bilal Alsharifi && Bretty on 2019-09-25.
  */
 class Constants {
-    final static String CERT_URL = "http://www.mocky.io/v2/5d9b565132000072002ae80f";
+    final static String CERT_URL = "http://run.mocky.io/v3/b095b2ad-65c4-4d33-8091-dae175c540d3";
     final static List<String> MAKE_LIST = Collections.singletonList("SDL");
     final static String CERT_PASS = "password"; // This needs to be changed to the actual certificate password
     final static String CERT_ISSUER = "SDL"; // This needs to be changed to the actual certificate issuer

diff --git a/SdlSecurity/sdl_security_se/build.gradle b/SdlSecurity/sdl_security_se/build.gradle
@@ -1,7 +1,7 @@
 apply plugin: 'java-library'
 
 group 'com.smartdevicelink'
-version '1.2.0'
+version '1.3.0'
 
 sourceCompatibility = 1.7
 
@@ -13,7 +13,7 @@ configurations {
 
 dependencies {
     extraLibs fileTree(dir: 'libs', include: ['*.jar'])
-    extraLibs 'com.smartdevicelink:sdl_java_se:5.0.0'
+    extraLibs 'com.smartdevicelink:sdl_java_se:5.1.0'
     configurations.api.extendsFrom(configurations.extraLibs)
 }
 

diff --git a/resources/certs/Sdl App/response.json b/resources/certs/Sdl App/response.json
@@ -1,10 +1,10 @@
 {
-  "meta": {
-    "request_id": "23e6f9dd-20fe-4e6d-b8d5-9777d7cda8c0",
-    "code": 200,
-    "message": null
-  },
-  "data": {
-    "certificate":"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"
-  }
+	"meta": {
+	    "request_id": "42f1545e-b16b-4517-b296-36d26edea986",
+	    "code": 200,
+	    "message": null
+	},
+	"data": {
+	    "certificate": "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"
+	}
 }
diff --git a/resources/certs/Sdl App/server.pfx b/resources/certs/Sdl App/server.pfx
diff --git a/resources/certs/Sdl Core/client.crt b/resources/certs/Sdl Core/client.crt
@@ -1,22 +1,4 @@
 -----BEGIN CERTIFICATE-----
-MIIDpDCCAowCCQC/QBcQX4ywRzANBgkqhkiG9w0BAQUFADCBmDELMAkGA1UEBhMC
-VVMxETAPBgNVBAgMCE1pY2hpZ2FuMRAwDgYDVQQHDAdEZXRyb2l0MRQwEgYDVQQK
-DAtGT1JEX0NMSUVOVDEYMBYGA1UECwwPRk9SRF9TRExfQ0xJRU5UMRQwEgYDVQQD
-DAtGT1JEX0NMSUVOVDEeMBwGCSqGSIb3DQEJARYPc2FtcGxlQGZvcmQuY29tMB4X
-DTE5MDgyMDIxMzc0NVoXDTQ3MDEwNTIxMzc0NVowgY4xCzAJBgNVBAYTAlJVMQ8w
-DQYDVQQIDAZSdXNzaWExFzAVBgNVBAcMDlN0LiBQZXRlcnNidXJnMQ8wDQYDVQQK
-DAZMdXhvZnQxETAPBgNVBAsMCEhlYWRVbml0MQ8wDQYDVQQDDAZjbGllbnQxIDAe
-BgkqhkiG9w0BCQEWEXNhbXBsZUBsdXhvZnQuY29tMIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEAr764JJgW9FaSXGt46c5VwLCu0cPNXysjuF8cZBGijeC6
-SVsgqZoI8hyzAf69xPzuyJriLqAeV76Z+Tg8Ji6yKOoL+6e+K58JjxrBfYPQUuKA
-3Uu2VkTiO4iZ01inUFXAxgJUG1n23pgVolS8n3IRT3O/5GBgJL+JV1rQjc8HOLWB
-aYZAvMDG98Hugl+jIErGCOlkGyfja+sS+JNJ31VaMNiQT1r1xg9hZmFW2QEbgmnd
-8wa87zJi0bGbFESuTfsfrAeaUmSfxa+2jHxe41rvQysXYsvW6tYd83YwCF+81yfO
-csKYLTTrN7IEd2KSgtarr2AjRgSQQEDrpQ3bqDFmDQIDAQABMA0GCSqGSIb3DQEB
-BQUAA4IBAQCN7t+N7Kv8fxtTC/5wpPVWbVfmWGVx6AV9aIMkxpw61fpvYHECXIxx
-NlXXzy4zgAJo/Fdbl4orxVF7Zm4fTED9CDfJQ3wWzR77R8By7PKhRMBplOp6q+RK
-twZ7OVxxyHvgAkyZD4GPCx99nzVPKhLu1feu0OIcGFZg5MTsHw2rXqweluez+Tpy
-kBQKwiv9ONwF8HCs0yTwjGdbOStQ2axFpAwqHAu0bLSrcAeW42ihXPGMATy7GgxC
-MnzJpLgFG4L05rllwU3fehHLfA8PQFzhkvWgnQx01H4ZYdIlgWMeCTF0hCcKTlO8
-+jx79kGwW+lp8D0ih7QPoSy8FxdlWBi/
------END CERTIFICATE-----
+MIIDCTCCAfECCQC04nRJZ0wLQjANBgkqhkiG9w0BAQsFADB3MQswCQYDVQQGEwJV UzERMA8GA1UECAwITWljaGlnYW4xEjAQBgNVBAcMCVJveWFsIE9hazEOMAwGA1UE CgwFTGl2aW8xEjAQBgNVBAMMCWxvY2FsaG9zdDEdMBsGCSqGSIb3DQEJARYOamFj b2JAbGl2aW8uaW8wIBcNMjEwNDE5MTc1MzUzWhgPMjA1MTA0MTkxNzUzNTNaMBQx EjAQBgNVBAMMCWxvY2FsaG9zdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC ggEBALl6JT8nhPlUe3c+SLCQKbjjvOt2ZOMJJcxUGfu7c/1/gvgGqGGgVdEVb7K0 Z0+/s/XzSUZCC6t/2XrJ5cqfyUb3/2S1oQ86xeKond3adUcUppIQLI6KzB2U56PH 5NsJWaXGXm/VRrBghaZP8qg5pDOKau5reazsjb6Qy6xZSgsyrMKpqVDdn2xWXNXz eBPHpEy4tFLK3AZNWZMHGI3E+LR9vfdwaEDjmV5JzjEBGgxpmn7Xhp7mWajKSxcx m6we10Oyb4+OxUADic6beNR9lLl7MDcwDppVrpULjiiPogHYMHojb3Gx8/FuW1a/ q6XCMS4zeu+Na6WUgMW3gC/ZMtcCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAFMKX zs/hx2qjCbFLjXFR4g10Ai3C4icaAS9i3b6iON3WqiQkzQ4YP5VPTlpemXGgDggw 1XqAGhjnCz5vJFIl+60p2aXLTkzVBAFNZoijtxW1wl0PnxogqSGV0uCmL5uu8xUX 4CQZQMnsF61fQseAdx/J+722kNTdivfCDrkeII09PVVxoJvQIorB7yYLreEq4KeY qCssXi4x3WuFF7tUCy/DSA/t8FtqaxzeyQwQMwd9t0r7GYnZNcJMGIVOVtP9hISx VHn271xKJk7yqygQJEnlIZgWof+kZR8MyCkyVwV2yN8t7Lq4rgFDVIwQBDMbxlMP
+HYom69UPQz9onxFxVA==
+-----END CERTIFICATE-----
diff --git a/resources/certs/Sdl Core/client.key b/resources/certs/Sdl Core/client.key
@@ -1,27 +1,4 @@
 -----BEGIN RSA PRIVATE KEY-----
-MIIEowIBAAKCAQEAr764JJgW9FaSXGt46c5VwLCu0cPNXysjuF8cZBGijeC6SVsg
-qZoI8hyzAf69xPzuyJriLqAeV76Z+Tg8Ji6yKOoL+6e+K58JjxrBfYPQUuKA3Uu2
-VkTiO4iZ01inUFXAxgJUG1n23pgVolS8n3IRT3O/5GBgJL+JV1rQjc8HOLWBaYZA
-vMDG98Hugl+jIErGCOlkGyfja+sS+JNJ31VaMNiQT1r1xg9hZmFW2QEbgmnd8wa8
-7zJi0bGbFESuTfsfrAeaUmSfxa+2jHxe41rvQysXYsvW6tYd83YwCF+81yfOcsKY
-LTTrN7IEd2KSgtarr2AjRgSQQEDrpQ3bqDFmDQIDAQABAoIBAQCMHUf+lOsoHqVN
-3blm3sRrffHC95KTH3e5FMsz1QN+jf63YVnnHhGnxc3J92kg1m8hrKpLdgj699EW
-awk5f9021XJ8Tr5FVORwHWrKQP8kNcV7qVNT8FNWF5Bceb/bQqMQuuaHb/Bsg2As
-Lda8YFsAt030LAo7AiHjbVn81WPyhx89EdepSenTffI/koeIrB5RSvvKbRMbpZFG
-Ox0eZ2mkAcsM8rzAKw6ngXdOUTaZWn7abXEdWKORc6UkSFz7ehnNM754ref7n94Z
-LcCksOx/xnswB6wXVnkn+3H6PhZ+h+LzQddF3DsRRLvpLgxJGOqCJfNVZ1AguCVN
-QvYBm/zZAoGBAOmWIrv+CGsW2YF4sNYIZitiG3VpyxO5awUxn6JokGh4978Mi/7A
-AjdZS5EJuS/1bLmzeqGxaqaHQFPmZxfXL4nakfD/TWryyLXWZhYNC5pGr+U06KB5
-Dyog7bZNdmlVRp7/nWqj6Gwas5mPMM3i8qPvaOmPOGPNZADPrgd8dqEzAoGBAMCb
-wRiHVAfk1CIlZoccy1FWiLnrBpJ9KSQ/UkHerP7A+/mmJHQJD4gW+0MmeuZpy4wx
-JCkQXOReUZ1LI0M2T+9EbJlSFtwxnF/nYwML0xgIZF6L+8m/njShi3Rhocyj3GBm
-c5tYioyg61fHml2chha6NiDHVc2xGGg+mt8iFlu/AoGAGTlKNOzAsfe8sxt6VRKB
-HewxNOOgt1eNc/kg2OPbvDxb3HiZYYAQfTOaUmYvZjtla0QzWOSUtLjkPGsj9NIa
-4xMEMXcQQB1JiUFGstjjyNwbQHAPMsz/0zfNE6OXxtYbky3dLNfYUFwtysZIqeL4
-+rTuqlH57+UNCH1kuJA7KzsCgYB0RdJ0x0VAGrDBCEjzqbtHl/CkI7BtAGe0vREg
-OJfAlqnGVLjO36Vjp1P5fqJUtGsvb37/1yPsrM+iH/jim0f4DhttFzQ7qytWbe3E
-qf++E1rcBK90ZFvSM+9my4WMbyMbgt2pWvMQ4BgSfqm+dz4vPCxu70bqDE3KqHh/
-2SkcKwKBgFoMfP9MlBTZ5EuAM/xJmILAiEKMvS6ZZOkQEgDIoPMED3vqpPNEZ3r2
-yCdMBBhS93+AGjJiKPp3mFpX3SlrqPcxiQn2gDBknQ67ua1zze94cmAfGCSQDQzM
-RhDeSPqXxI056rPQWcSPbtc3T12ce5/zTd3swLJCWLVmwOvZc+3S
------END RSA PRIVATE KEY-----
+MIIEowIBAAKCAQEAuXolPyeE+VR7dz5IsJApuOO863Zk4wklzFQZ+7tz/X+C+Aao YaBV0RVvsrRnT7+z9fNJRkILq3/Zesnlyp/JRvf/ZLWhDzrF4qid3dp1RxSmkhAs jorMHZTno8fk2wlZpcZeb9VGsGCFpk/yqDmkM4pq7mt5rOyNvpDLrFlKCzKswqmp UN2fbFZc1fN4E8ekTLi0UsrcBk1ZkwcYjcT4tH2993BoQOOZXknOMQEaDGmafteG nuZZqMpLFzGbrB7XQ7Jvj47FQAOJzpt41H2UuXswNzAOmlWulQuOKI+iAdgweiNv cbHz8W5bVr+rpcIxLjN6741rpZSAxbeAL9ky1wIDAQABAoIBAQCvO2xHL3IdEakY LnsEfR8988N//jowmWrhka9+ukpKfJbi939LxOxu/j6qanCU0rwWKUTYIPvfiomQ zYDRn4bNCu56WnMQ7WkZzE5h1MwqXKNGqgs+nHldlVoHzYo1Oq88xJ5iL/B6IKcE StIqB1NP8n02RcoOCuub2Dbk3PLsgdcdLrRuJMK/EdJF0ehHs4/yf26CIY9DiMZL vtSMHHrPBpKTJSTcLtJN86llrLes38LIxlrlfQqyNQSlehhfMlaMN15SMXSczhZr jsZMb3qIUtMLmt/qVQZhPA6N8Lca1uwpsm5cLYS6FMShyanoAcb3bDKzRF3CZtHn ygoATOiJAoGBANwgjL7t/x8k/odGeMnLCehCOo8o0m4smqrGtBcy3dCEVPm+/w9R IMxvC4z+iGFKEqHWZZz2/zeXsuxSidFYsQO9n+tsix4IugtC/pl5QvcRj6HbFbCc /07xHCM2l8fB5ujaUnLAEDADzf2A/bTTfhm3mHbSdSyxaNYHRKFKlwVrAoGBANe0 CXwVuLHvf2vZbemv5Sab9SmtM4kFuhFeQvQlODlJXslISJBjVffrHwQ+dQttZ9iN BRJUCI5f9qZbLfdHo2+llhrUxtrtCR9Pq0UHVMzZRNQBObzzlH8lCyYv9fRfsiQL NISucMVn6qdLseo+z+TVrvCme2Jryyo22gds4HdFAoGAPOtBKEHDPgJF8nf9S5NG PaG+hQn+GoF7mFF/W4A3RNKqladW/Q0tr4X3w2BZq9sNBv7HhkYQ4Xi5Co/ZFjee XXOoA0Y5xekSW7WBskWN08RnZJq2CPeZ7GXrrI8aOC0gU0bAVIN0t2UGJ+b/z4BM QJ+/sPqTdPfwFHNUefKjktsCgYA1+Jg+8fhqnTBWveqghCBkDrXDHdE9Qa+S1PEP wZhVzSPoXSu65QAHrk7ucuo6V7+aEX7pXRle9mfyq/HOY6BjOR1bzU2MTa7wpLCH 7xOqxdpQ6ZWWz6OiRJSLk4iJAsDCAAO+Bx+0ZRHzlh8IK3s9GLJTCHTq5WnKQDtB jF6FuQKBgHCcAYXnATWDE0hgCYQkiOjs4NXkohMx5doi40lMy9O+g1e5MoTWkfpc FOfbH9kdwzX2Pnz01csBMRNtSCLP62L7XKpxd1ydmS6jdiATCMF3umj++cnxu8q9
+oQBuu68Xnn/Cad5xqNMpl7C3PsTJOWF/KEccbTlbt4gRLUPwhNhX
+-----END RSA PRIVATE KEY-----
diff --git a/resources/certs/Sdl Core/client.pfx b/resources/certs/Sdl Core/client.pfx
diff --git a/resources/readme.md b/resources/readme.md
@@ -1,7 +1,7 @@
 # SDL Security Java Suite
 
 ## Sdl Core Setup
-* Copy the sample `client.crt` & `client.key` to core's build `bin` folder
+* Copy the sample `client.crt` & `client.key` to core's build `bin` folder and remove the existing `mycert.pem` & `mykey.pem` certificates
 
 * Update `CertificatePath` & `KeyPath` in `smartDeviceLink.ini` to match the files names
 ```
@@ -37,7 +37,7 @@ builder.setSdlSecurity(secList, null);
 
 * Update the SDL Server endpoint in `Constants.java` to download the certificate. Also the certificate passphrase should be updated
 
-Note: For testing purposes only, you can use the sample JSON response file with an api mocking service like `mocky.io`. If you want to use the sample response, the `appId` for your sdl app should be set to `773692255`. And the passphrase should be set to `CERT_PASS = "password"`
+Note: For testing purposes only, you can use the sample JSON response file with an api mocking service like `mocky.io`. If you want to use the sample response, the `appId` for your sdl app should be set to `caaf9c76-5a2e-4fa6-af4d-81279de9ca8c`. And the passphrase should be set to `CERT_PASS = "password"`
 
 * Use a feature that uses encryption (like RPC protection or encrypted video streaming)