WolfSSLCertificate: let Java do the modified UTF-8 conversion for toString()

Author: cconlon

native/com_wolfssl_WolfSSLCertificate.c

@@ -418,12 +418,13 @@ JNIEXPORT jstring JNICALL Java_com_wolfssl_WolfSSLCertificate_X509_1get_1signatu
     return (*jenv)->NewStringUTF(jenv, oid);
 }
 
-JNIEXPORT jstring JNICALL Java_com_wolfssl_WolfSSLCertificate_X509_1print
+JNIEXPORT jbyteArray JNICALL Java_com_wolfssl_WolfSSLCertificate_X509_1print
   (JNIEnv* jenv, jclass jcl, jlong x509Ptr)
 {
     WOLFSSL_BIO* bio;
-    jstring ret = NULL;
+    int sz = 0;
     const char* mem = NULL;
+    jbyteArray  memArr = NULL;
     WOLFSSL_X509* x509 = (WOLFSSL_X509*)(uintptr_t)x509Ptr;
     (void)jcl;
 
@@ -441,12 +442,25 @@ JNIEXPORT jstring JNICALL Java_com_wolfssl_WolfSSLCertificate_X509_1print
         return NULL;
     }
 
-    wolfSSL_BIO_get_mem_data(bio, &mem);
-    if (mem != NULL) {
-        ret = (*jenv)->NewStringUTF(jenv, mem);
+    sz = wolfSSL_BIO_get_mem_data(bio, &mem);
+    if (sz > 0 && mem != NULL) {
+
+        memArr = (*jenv)->NewByteArray(jenv, sz);
+        if (memArr == NULL) {
+            wolfSSL_BIO_free(bio);
+            return NULL;
+        }
+
+        (*jenv)->SetByteArrayRegion(jenv, memArr, 0, sz, (jbyte*)mem);
+        if ((*jenv)->ExceptionOccurred(jenv)) {
+            /* failed to set byte region */
+            (*jenv)->DeleteLocalRef(jenv, memArr);
+            wolfSSL_BIO_free(bio);
+            return NULL;
+        }
     }
     wolfSSL_BIO_free(bio);
-    return ret;
+    return memArr;
 }
 
 JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSLCertificate_X509_1get_1isCA

native/com_wolfssl_WolfSSLCertificate.h

@@ -25,6 +25,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.ByteArrayInputStream;
+import java.nio.charset.Charset;
 import java.math.BigInteger;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -62,7 +63,7 @@ public class WolfSSLCertificate {
     static native byte[] X509_get_signature(long x509);
     static native String X509_get_signature_type(long x509);
     static native String X509_get_signature_OID(long x509);
-    static native String X509_print(long x509);
+    static native byte[] X509_print(long x509);
     static native int X509_get_isCA(long x509);
     static native String X509_get_subject_name(long x509);
     static native String X509_get_issuer_name(long x509);
@@ -600,7 +601,20 @@ public X509Certificate getX509Certificate()
 
     @Override
     public String toString() {
-        return X509_print(this.x509Ptr);
+
+        byte[] x509Text;
+
+        if (this.active == false) {
+            return super.toString();
+        }
+
+        x509Text = X509_print(this.x509Ptr);
+        if (x509Text != null) {
+            /* let Java do the modified UTF-8 conversion */
+            return new String(x509Text, Charset.forName("UTF-8"));
+        }
+
+        return super.toString();
     }
 
     /**