!15 增加加密协议传输支持

Merge pull request !15 from dongzhengkuan/master

BUILD.gn

@@ -46,25 +46,14 @@ config("cups_config") {
     "$cups_code_dir",
     "$core_code_dir",
     "//third_party/libusb/libusb",
+    "//third_party/openssl/include",
   ]
 
   cflags = [
-    "-w",
-    "-std=c99",
-    "-D_PPD_DEPRECATED=",
-    "-Wextra",
-    "-Wall",
-    "-Wno-unused-parameter",
     "-Wno-unused-function",
-    "-Wno-unused-variable",
     "-Wno-unused-value",
-    "-Wno-sign-compare",
-    "-Wno-missing-field-initializers",
-    "-Wno-implicit-function-declaration",
-    "-Wno-deprecated-declarations",
-    "-Wno-incompatible-pointer-types-discards-qualifiers",
-    "-Wno-implicit-int",
     "-Wno-implicit-function-declaration",
+    "-Wno-int-conversion",
   ]
 }
 
@@ -125,13 +114,18 @@ ohos_shared_library("cups") {
     "$core_code_dir/string.c",
     "$core_code_dir/tempfile.c",
     "$core_code_dir/thread.c",
+    "$core_code_dir/tls-openssl.c",
     "$core_code_dir/tls.c",
     "$core_code_dir/transcode.c",
     "$core_code_dir/usersys.c",
     "$core_code_dir/util.c",
   ]
 
-  deps = [ "//third_party/zlib:libz" ]
+  deps = [
+    "//third_party/openssl:libcrypto_shared",
+    "//third_party/openssl:libssl_shared",
+    "//third_party/zlib:libz",
+  ]
 
   public_configs = [ ":cups_config" ]
 
@@ -344,7 +338,8 @@ ohos_executable("cups-exec") {
 }
 
 ohos_prebuilt_etc("mime.convs") {
-  exec_script(rebase_path("//third_party/cups/generate_mime_convs.py"), [rebase_path("//third_party/cups/cups-2.4.0/conf")])
+  exec_script(rebase_path("//third_party/cups/generate_mime_convs.py"),
+              [ rebase_path("//third_party/cups/cups-2.4.0/conf") ])
   source = "$cups_code_dir/conf/mime.convs"
   relative_install_dir = "cups/share/mime"
   subsystem_name = "$SUBSYSTEM_NAME"
@@ -356,4 +351,4 @@ ohos_prebuilt_etc("mime.types") {
   relative_install_dir = "cups/share/mime"
   subsystem_name = "$SUBSYSTEM_NAME"
   part_name = "$PART_NAME"
-}
+}

bundle.json

@@ -23,7 +23,8 @@
         "deps": {
             "components": [],
             "third_party": [
-                "zlib"
+                "zlib",
+                "openssl"
             ]
         },
         "build": {

config.h

@@ -65,6 +65,8 @@
 #define HAVE_WAIT3 1
 #define HAVE_MALLOC_H 1
 #define HAVE_LANGINFO_H 1
+#define HAVE_TLS 1
+#define HAVE_OPENSSL 1
 #define HAVE_SYS_IOCTL_H 1
 #define HAVE_TM_GMTOFF 1
 #define HAVE_RRESVPORT_AF 1

install.sh

@@ -22,6 +22,7 @@ cd $1/cups-2.4.0
 patch -p1 < $1/backport-CVE-2022-26691.patch --fuzz=0 --no-backup-if-mismatch
 patch -p1 < $1/backport-CVE-2023-32324.patch --fuzz=0 --no-backup-if-mismatch
 patch -p1 < $1/backport-CVE-2023-34241.patch --fuzz=0 --no-backup-if-mismatch
-patch -p1 < $1/cups_single_file.patch --fuzz=0 --no-backup-if-mismatch
-patch -p1 < $1/pthread_cancel.patch --fuzz=0 --no-backup-if-mismatch
+patch -p1 < $1/ohos-multi-file-print.patch --fuzz=0 --no-backup-if-mismatch
+patch -p1 < $1/ohos-modify-pthread.patch --fuzz=0 --no-backup-if-mismatch
+patch -p1 < $1/ohos-add-openssl.patch --fuzz=0 --no-backup-if-mismatch
 exit 0