From e24de483298f09a21dcac2e8a4c3661199d5d45a Mon Sep 17 00:00:00 2001
From: lanming <lanming@huawei.com>
Date: Wed, 19 Feb 2025 20:01:26 +0800
Subject: [PATCH] =?UTF-8?q?sm2=E7=AD=BE=E5=90=8D=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E8=BD=AC=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: lanming <lanming@huawei.com>
---
 1                                       | 33 ++++++++++
 api/@ohos.security.cryptoFramework.d.ts | 82 ++++++++++++++++++++++++-
 2 files changed, 114 insertions(+), 1 deletion(-)
 create mode 100644 1

diff --git a/1 b/1
new file mode 100644
index 000000000..782314eca
--- /dev/null
+++ b/1
@@ -0,0 +1,33 @@
+pick 61cdbf1c3 sm2签名数据转换
+f 3e2ddf481 123
+
+# Rebase b7d3fdf7e..3e2ddf481 onto b7d3fdf7e (2 commands)
+#
+# Commands:
+# p, pick <commit> = use commit
+# r, reword <commit> = use commit, but edit the commit message
+# e, edit <commit> = use commit, but stop for amending
+# s, squash <commit> = use commit, but meld into previous commit
+# f, fixup [-C | -c] <commit> = like "squash" but keep only the previous
+#                    commit's log message, unless -C is used, in which case
+#                    keep only this commit's message; -c is same as -C but
+#                    opens the editor
+# x, exec <command> = run command (the rest of the line) using shell
+# b, break = stop here (continue rebase later with 'git rebase --continue')
+# d, drop <commit> = remove commit
+# l, label <label> = label current HEAD with a name
+# t, reset <label> = reset HEAD to a label
+# m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]
+#         create a merge commit using the original merge commit's
+#         message (or the oneline, if no original merge commit was
+#         specified); use -c <commit> to reword the commit message
+# u, update-ref <ref> = track a placeholder for the <ref> to be updated
+#                       to this position in the new commits. The <ref> is
+#                       updated at the end of the rebase
+#
+# These lines can be re-ordered; they are executed from top to bottom.
+#
+# If you remove a line here THAT COMMIT WILL BE LOST.
+#
+# However, if you remove everything, the rebase will be aborted.
+#
diff --git a/api/@ohos.security.cryptoFramework.d.ts b/api/@ohos.security.cryptoFramework.d.ts
index deb0aa9a0..b1d0885b7 100644
--- a/api/@ohos.security.cryptoFramework.d.ts
+++ b/api/@ohos.security.cryptoFramework.d.ts
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022-2024 Huawei Device Co., Ltd.
+ * Copyright (c) 2022-2025 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -8964,6 +8964,86 @@ declare namespace cryptoFramework {
      */
     static getCipherTextSpec(cipherText: DataBlob, mode?: string): SM2CipherTextSpec;
   }
+
+  /**
+   * Defines the ECC signature spec, also works with SM2 signature.
+   *
+   * @typedef EccSignatureSpec
+   * @syscap SystemCapability.Security.CryptoFramework.Signature
+   * @crossplatform
+   * @atomicservice
+   * @since 20
+   */
+
+  interface EccSignatureSpec {
+    /**
+     * Indicates the r value of the signature.
+     *
+     * @type { bigint }
+     * @syscap SystemCapability.Security.CryptoFramework.Signature
+     * @crossplatform
+     * @atomicservice
+     * @since 20
+     */
+    r: bigint;
+
+    /**
+     * Indicates the s value of the signature.
+     *
+     * @type { bigint }
+     * @syscap SystemCapability.Security.CryptoFramework.Signature
+     * @crossplatform
+     * @atomicservice
+     * @since 20
+     */
+    s: bigint;
+  }
+
+  /**
+   * Utilities for signature operations.
+   *
+   * @syscap SystemCapability.Security.CryptoFramework.Signature
+   * @crossplatform
+   * @atomicservice
+   * @since 20
+   */
+  class SignatureUtils {
+    /**
+     * Generates the ECC signature spec from the ECC signature in DER format.
+     *
+     * @param { Uint8Array } data - indicates the signature in DER format.
+     * @returns { EccSignatureSpec } the ECC signature spec.
+     * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified;
+     * <br>2. Incorrect parameter types; 3. Parameter verification failed.
+     * @throws { BusinessError } 17620001 - memory error.
+     * @throws { BusinessError } 17620002 - runtime error.
+     * @throws { BusinessError } 17630001 - crypto operation error.
+     * @static
+     * @syscap SystemCapability.Security.CryptoFramework.Signature
+     * @crossplatform
+     * @atomicservice
+     * @since 20
+     */
+    static genEccSignatureSpec(data: Uint8Array): EccSignatureSpec;
+
+    /**
+     * Generates the ECC signature in DER format according to the ECC signature spec.
+     *
+     * @param { EccSignatureSpec } spec - indicates the ECC signature spec.
+     * @returns { Uint8Array } the signature in DER format.
+     * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified;
+     * <br>2. Incorrect parameter types; 3. Parameter verification failed.
+     * @throws { BusinessError } 17620001 - memory error.
+     * @throws { BusinessError } 17620002 - runtime error.
+     * @throws { BusinessError } 17630001 - crypto operation error.
+     * @static
+     * @syscap SystemCapability.Security.CryptoFramework.Signature
+     * @crossplatform
+     * @atomicservice
+     * @since 20
+     */
+    static genEccSignature(spec: EccSignatureSpec): Uint8Array;
+  }
 }
 
 export default cryptoFramework;
-- 
Gitee