TicketNo:DTS2020051901498

Description:openssl support to build by arm
Team:OTHERS
Feature or Bugfix:Bugfix
Binary Source:No
PrivateCode(Yes/No):No

Change-Id: Iedde66caa66b2baa5c1a4508240849da0e434efd
Reviewed-on: http://mgit-tm.rnd.huawei.com/8910856Reviewed-by: Ndongjinguang 00268009 <dongjinguang@huawei.com>
Reviewed-by: Nhouyuezhou 00386575 <hou@huawei.com>
Tested-by: Npublic jenkins <public_jenkins@notesmail.huawei.com>
Reviewed-by: Nlinyibin 00246405 <linyibin@huawei.com>

BUILD.gn

@@ -30,6 +30,16 @@ config("crypto_config") {
   ]
 }
 
+config("crypto_config_public") {
+  include_dirs = [
+    "./include",
+  ]
+
+  if (target_cpu == "arm") {
+    cflags = ["-DCPU_ARM32"]
+  }
+}
+
 harmonyos_source_set("crypto_source") {
   sources = [
     "crypto/aes/aes_cbc.c",
@@ -639,7 +649,9 @@ harmonyos_source_set("crypto_source") {
 
   configs = [
     ":crypto_config",
+    ":crypto_config_public",
   ]
+
   remove_configs = ["//build/config/coverage:default_coverage"]
 }
 
@@ -647,6 +659,9 @@ harmonyos_static_library("libcrypto_static") {
   deps = [
     ":crypto_source"
   ]
+  public_configs = [
+    ":crypto_config_public",
+  ]
   complete_static_lib = true
   remove_configs = ["//build/config/coverage:default_coverage"]
 }

crypto/include/internal/bn_conf.h

@@ -21,8 +21,13 @@
 /* Should we define BN_DIV2W here? */
 
 /* Only one for the following should be defined */
+#if defined(CPU_ARM32)
+#undef SIXTY_FOUR_BIT_LONG
+#undef SIXTY_FOUR_BIT
+#define THIRTY_TWO_BIT
+#else
 #define SIXTY_FOUR_BIT_LONG
 #undef SIXTY_FOUR_BIT
 #undef THIRTY_TWO_BIT
-
+#endif
 #endif

include/openssl/opensslconf.h

@@ -202,12 +202,20 @@ extern "C" {
  * The following are cipher-specific, but are part of the public API.
  */
 #if !defined(OPENSSL_SYS_UEFI)
+#if defined(CPU_ARM32)
+# define BN_LLONG
+/* Only one for the following should be defined */
+# undef SIXTY_FOUR_BIT_LONG
+# undef SIXTY_FOUR_BIT
+# define THIRTY_TWO_BIT
+#else
 # undef BN_LLONG
 /* Only one for the following should be defined */
 # define SIXTY_FOUR_BIT_LONG
 # undef SIXTY_FOUR_BIT
 # undef THIRTY_TWO_BIT
 #endif
+#endif
 
 #define RC4_INT unsigned char