Merge pull request #23 from smartdevicelink/release/1.4.0

Release/1.4.0
smartdevicelink · Jul 1, 2021 · becf0d0 · becf0d0
2 parents 8160eb7 + 2b54627
commit becf0d0
Show file tree

Hide file tree

Showing 9 changed files with 8 additions and 8 deletions.
diff --git a/SdlSecurity/sdl_security/build.gradle b/SdlSecurity/sdl_security/build.gradle
@@ -6,8 +6,8 @@ android {
     defaultConfig {
         minSdkVersion 26
         targetSdkVersion 30
-        versionCode 3
-        versionName "1.3.0"
+        versionCode 4
+        versionName "1.4.0"
 
         ndk {
             moduleName "ssl"
@@ -34,5 +34,5 @@ android {
 dependencies {
     api fileTree(dir: 'libs', include: ['*.jar'])
     api 'androidx.appcompat:appcompat:1.2.0'
-    api 'com.smartdevicelink:sdl_android:5.1.0'
+    api 'com.smartdevicelink:sdl_android:5.2.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
@@ -13,7 +13,7 @@ class Constants {
     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
+    final static String CERT_ISSUER = "/C=US/ST=Michigan/L=Royal Oak/O=Livio/CN=localhost/emailAddress=jacob@livio.io"; // This needs to be changed to the actual certificate issuer
 
     static {
         try {

diff --git a/SdlSecurity/sdl_security/src/main/jni/tlsEngine.cpp b/SdlSecurity/sdl_security/src/main/jni/tlsEngine.cpp
@@ -241,8 +241,8 @@ bool initialize(JNIEnv* env, void* cert_buffer, int cert_len, bool is_client) {
     char* cert_issuer = X509_NAME_oneline(X509_get_issuer_name(certX509), NULL, 0);
     if (strcmp(cert_issuer, CERT_ISSUER) != 0) {
         printf("Error in verifying issuer name. Expected %s but found %s\n", CERT_ISSUER, cert_issuer);
-        // we are only printing error message in that case to make testing easier
-        // it should stop initialization and return false in production libraries
+        clean_up_initialization(certX509, rsa, p12, pbio, pkey);
+        return false;
     }
 
     rsa = EVP_PKEY_get1_RSA(pkey);

diff --git a/SdlSecurity/sdl_security/src/main/libs/arm64-v8a/libsecurity.so b/SdlSecurity/sdl_security/src/main/libs/arm64-v8a/libsecurity.so
diff --git a/SdlSecurity/sdl_security/src/main/libs/x86/libsecurity.so b/SdlSecurity/sdl_security/src/main/libs/x86/libsecurity.so
diff --git a/SdlSecurity/sdl_security/src/main/libs/x86_64/libsecurity.so b/SdlSecurity/sdl_security/src/main/libs/x86_64/libsecurity.so
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.3.0'
+version '1.4.0'
 
 sourceCompatibility = 1.7
 
@@ -13,7 +13,7 @@ configurations {
 
 dependencies {
     extraLibs fileTree(dir: 'libs', include: ['*.jar'])
-    extraLibs 'com.smartdevicelink:sdl_java_se:5.1.0'
+    extraLibs 'com.smartdevicelink:sdl_java_se:5.2.0'
     configurations.api.extendsFrom(configurations.extraLibs)
 }
 

diff --git a/SdlSecurity/sdl_security_se/libs/libsecurity.jar b/SdlSecurity/sdl_security_se/libs/libsecurity.jar
diff --git a/SdlSecurity/sdl_security_se/src/main/libs/libsecurity.dylib b/SdlSecurity/sdl_security_se/src/main/libs/libsecurity.dylib