lws/mbedtls-openssl: Supplement x509 method structure implementation

Signed-off-by: makejian <makejian@xiaomi.com>

Author: ThePassionate

lib/tls/mbedtls/wrapper/include/internal/ssl_types.h

@@ -297,6 +297,10 @@ struct x509_method_st {
 
     int (*x509_load)(X509 *x, const unsigned char *buf, int len);
 
+    int (*x509_load_file)(X509 *x, const char *file);
+
+    int (*x509_load_path)(X509 *x, const char *path);
+
     int (*x509_show_info)(X509 *x);
 };
 

lib/tls/mbedtls/wrapper/platform/ssl_pm.c

@@ -727,35 +727,61 @@ int x509_pm_load_file(X509 *x, const char *path)
     int ret;
     struct x509_pm *x509_pm = (struct x509_pm *)x->x509_pm;
 
-    mbedtls_x509_crt_free(&x509_pm->x509_crt);
-    mbedtls_x509_crt_init(&x509_pm->x509_crt);
-    ret = mbedtls_x509_crt_parse_file(&x509_pm->x509_crt, path);
+    if (!x509_pm->x509_crt) {
+        x509_pm->x509_crt = ssl_mem_malloc(sizeof(mbedtls_x509_crt) + 80);
+        if (!x509_pm->x509_crt) {
+            SSL_DEBUG(SSL_PLATFORM_ERROR_LEVEL, "no enough memory > (x509_pm->x509_crt)");
+            goto no_mem;
+        }
+        mbedtls_x509_crt_init(x509_pm->x509_crt);
+    }
+
+    ret = mbedtls_x509_crt_parse_file(x509_pm->x509_crt, path);
     if (ret) {
         SSL_DEBUG(SSL_PLATFORM_ERROR_LEVEL,
                   "mbedtls_x509_crt_parse_file return -0x%x", -ret);
-        mbedtls_x509_crt_free(&x509_pm->x509_crt);
-        return -1;
+        goto failed;
     }
 
     return 0;
+
+failed:
+    mbedtls_x509_crt_free(x509_pm->x509_crt);
+    ssl_mem_free(x509_pm->x509_crt);
+    x509_pm->x509_crt = NULL;
+no_mem:
+    return -1;
 }
 
 int x509_pm_load_path(X509 *x, const char *path)
 {
     int ret;
     struct x509_pm *x509_pm = (struct x509_pm *)x->x509_pm;
 
-    mbedtls_x509_crt_free(&x509_pm->x509_crt);
-    mbedtls_x509_crt_init(&x509_pm->x509_crt);
-    ret = mbedtls_x509_crt_parse_path(&x509_pm->x509_crt, path);
+    if (!x509_pm->x509_crt) {
+        x509_pm->x509_crt = ssl_mem_malloc(sizeof(mbedtls_x509_crt) + 80);
+        if (!x509_pm->x509_crt) {
+            SSL_DEBUG(SSL_PLATFORM_ERROR_LEVEL, "no enough memory > (x509_pm->x509_crt)");
+            goto no_mem;
+        }
+        mbedtls_x509_crt_init(x509_pm->x509_crt);
+    }
+
+    ret = mbedtls_x509_crt_parse_path(x509_pm->x509_crt, path);
     if (ret) {
         SSL_DEBUG(SSL_PLATFORM_ERROR_LEVEL,
-                  "mbedtls_x509_crt_parse_file return -0x%x", -ret);
-        mbedtls_x509_crt_free(&x509_pm->x509_crt);
-        return -1;
+                  "mbedtls_x509_crt_parse_path return -0x%x", -ret);
+        goto failed;
     }
 
     return 0;
+
+failed:
+    mbedtls_x509_crt_free(x509_pm->x509_crt);
+    ssl_mem_free(x509_pm->x509_crt);
+    x509_pm->x509_crt = NULL;
+no_mem:
+    return -1;
 }
 
 int pkey_pm_new(EVP_PKEY *pk, EVP_PKEY *m_pkey, void *rngctx)