From a43a5cd1dcd554350d4eda6728dca45d70ec22cf Mon Sep 17 00:00:00 2001 From: leo9001 Date: Mon, 14 Jul 2025 08:32:48 +0000 Subject: [PATCH] support @ohos.net.networkSecurity.d.ets support @ohos.net.networkSecurity.d.ets Issue: https://gitee.com/openharmony/communication_netstack/issues/ICM5Z2 Signed-off-by: leo9001 Change-Id: I2455c5d5aaa7557b7639bcb2087b6cfbcedcb943 --- .../ets/@ohos.net.networkSecurity.d.ets | 22 ++++++++++++++----- frameworks/ets/ani/net_ssl/src/lib.rs | 8 +++---- 2 files changed, 21 insertions(+), 9 deletions(-) diff --git a/frameworks/ets/ani/net_ssl/ets/@ohos.net.networkSecurity.d.ets b/frameworks/ets/ani/net_ssl/ets/@ohos.net.networkSecurity.d.ets index 76f710f33..48315bee8 100644 --- a/frameworks/ets/ani/net_ssl/ets/@ohos.net.networkSecurity.d.ets +++ b/frameworks/ets/ani/net_ssl/ets/@ohos.net.networkSecurity.d.ets @@ -31,10 +31,12 @@ export default namespace networkSecurity { data: string | ArrayBuffer; } + export native function nativeCertVerification(cert: CertBlob, caCert?: CertBlob): int; + export function certVerification(cert: CertBlob, caCert?: CertBlob): Promise { return new Promise((resolve, reject) => { taskpool.execute((): int => { - return certVerificationAsync(cert, caCert); + return nativeCertVerification(cert, caCert); }).then((content: NullishType) => { resolve(content as int); }, (err: Error): void => { @@ -43,11 +45,21 @@ export default namespace networkSecurity { }); } - export native function certVerificationAsync(cert: CertBlob, caCert?: CertBlob): int; + export native function nativeCertVerificationSync(cert: CertBlob, caCert?: CertBlob): int; + + export function certVerificationSync(cert: CertBlob, caCert?: CertBlob): int { + return nativeCertVerificationSync(cert, caCert); + } + + export native function nativeIsCleartextPermitted(): boolean; - export native function certVerificationSync(cert: CertBlob, caCert?: CertBlob): int; + export function isCleartextPermitted(): boolean { + return nativeIsCleartextPermitted(); + } - export native function isCleartextPermitted(): boolean; + export native function nativeIsCleartextPermittedByHostName(hostName: string): boolean; - export native function isCleartextPermittedByHostName(hostName: string): boolean; + export function isCleartextPermittedByHostName(hostName: string): boolean { + return nativeIsCleartextPermittedByHostName(hostName); + } } diff --git a/frameworks/ets/ani/net_ssl/src/lib.rs b/frameworks/ets/ani/net_ssl/src/lib.rs index 095fcf4ae..b6abee426 100644 --- a/frameworks/ets/ani/net_ssl/src/lib.rs +++ b/frameworks/ets/ani/net_ssl/src/lib.rs @@ -18,9 +18,9 @@ mod wrapper; ani_rs::ani_constructor! { namespace "L@ohos/net/networkSecurity/networkSecurity" [ - "isCleartextPermitted" : security::is_cleartext_permitted , - "isCleartextPermittedByHostName" : security::is_cleartext_permitted_by_host_name , - "certVerificationAsync" : security::cert_verification_async, - "certVerificationSync" : security::cert_verification_sync + "nativeIsCleartextPermitted" : security::is_cleartext_permitted , + "nativeIsCleartextPermittedByHostName" : security::is_cleartext_permitted_by_host_name , + "nativeCertVerification" : security::cert_verification_async, + "nativeCertVerificationSync" : security::cert_verification_sync ] } -- Gitee