diff --git a/components/security/openssl/origin.patch b/components/security/openssl/origin.patch index 4e7376ebd57e9dddb23c9ab109da28e427892e68..d77cb5ffe1b11ed2be0bd937b34a0e69c7eb38e3 100644 --- a/components/security/openssl/origin.patch +++ b/components/security/openssl/origin.patch @@ -1,25 +1,15 @@ -git diff -Nur -p1 a/OpenSSL_1_1_0e/crypto/bf/bf_cbc.c b/OpenSSL_1_1_0e/crypto/bf/bf_cbc.c ---- a/OpenSSL_1_1_0e/crypto/bf/bf_cbc.c 2017-02-16 19:58:19.000000000 +0800 -+++ b/OpenSSL_1_1_0e/crypto/bf/bf_cbc.c 2021-03-22 11:52:44.457197299 +0800 -@@ -12,2 +12,3 @@ - -+#if 0 - void BF_cbc_encrypt(const unsigned char *in, unsigned char *out, long length, -@@ -86 +87,2 @@ void BF_cbc_encrypt(const unsigned char - } -+#endif -git diff -Nur -p1 a/OpenSSL_1_1_0e/crypto/bio/b_dump.c b/OpenSSL_1_1_0e/crypto/bio/b_dump.c +diff -Nur -p1 a/OpenSSL_1_1_0e/crypto/bio/b_dump.c b/OpenSSL_1_1_0e/crypto/bio/b_dump.c --- a/OpenSSL_1_1_0e/crypto/bio/b_dump.c 2017-02-16 19:58:19.000000000 +0800 -+++ b/OpenSSL_1_1_0e/crypto/bio/b_dump.c 2021-03-22 11:52:44.457197299 +0800 ++++ b/OpenSSL_1_1_0e/crypto/bio/b_dump.c 2021-06-30 15:48:12.115452070 +0800 @@ -16,3 +16,5 @@ +#ifndef TRUNCATE #define TRUNCATE +#endif #define DUMP_WIDTH 16 -git diff -Nur -p1 a/OpenSSL_1_1_0e/crypto/bio/bss_acpt.c b/OpenSSL_1_1_0e/crypto/bio/bss_acpt.c +diff -Nur -p1 a/OpenSSL_1_1_0e/crypto/bio/bss_acpt.c b/OpenSSL_1_1_0e/crypto/bio/bss_acpt.c --- a/OpenSSL_1_1_0e/crypto/bio/bss_acpt.c 2017-02-16 19:58:19.000000000 +0800 -+++ b/OpenSSL_1_1_0e/crypto/bio/bss_acpt.c 2021-03-22 11:52:44.457197299 +0800 ++++ b/OpenSSL_1_1_0e/crypto/bio/bss_acpt.c 2021-06-30 15:48:12.115452070 +0800 @@ -12,3 +12,3 @@ #include "bio_lcl.h" - @@ -30,9 +20,9 @@ git diff -Nur -p1 a/OpenSSL_1_1_0e/crypto/bio/bss_acpt.c b/OpenSSL_1_1_0e/crypto - shutdown(c->accept_sock, 2); + lwip_shutdown(c->accept_sock, 2); closesocket(c->accept_sock); -git diff -Nur -p1 a/OpenSSL_1_1_0e/crypto/bio/bss_conn.c b/OpenSSL_1_1_0e/crypto/bio/bss_conn.c +diff -Nur -p1 a/OpenSSL_1_1_0e/crypto/bio/bss_conn.c b/OpenSSL_1_1_0e/crypto/bio/bss_conn.c --- a/OpenSSL_1_1_0e/crypto/bio/bss_conn.c 2017-02-16 19:58:19.000000000 +0800 -+++ b/OpenSSL_1_1_0e/crypto/bio/bss_conn.c 2021-03-22 11:52:44.457197299 +0800 ++++ b/OpenSSL_1_1_0e/crypto/bio/bss_conn.c 2021-06-30 15:48:12.115452070 +0800 @@ -13,3 +13,3 @@ #include "bio_lcl.h" - @@ -43,9 +33,9 @@ git diff -Nur -p1 a/OpenSSL_1_1_0e/crypto/bio/bss_conn.c b/OpenSSL_1_1_0e/crypto - shutdown(bio->num, 2); + lwip_shutdown(bio->num, 2); BIO_closesocket(bio->num); -git diff -Nur -p1 a/OpenSSL_1_1_0e/crypto/bio/bss_log.c b/OpenSSL_1_1_0e/crypto/bio/bss_log.c +diff -Nur -p1 a/OpenSSL_1_1_0e/crypto/bio/bss_log.c b/OpenSSL_1_1_0e/crypto/bio/bss_log.c --- a/OpenSSL_1_1_0e/crypto/bio/bss_log.c 2017-02-16 19:58:19.000000000 +0800 -+++ b/OpenSSL_1_1_0e/crypto/bio/bss_log.c 2021-03-22 11:52:44.457197299 +0800 ++++ b/OpenSSL_1_1_0e/crypto/bio/bss_log.c 2021-06-30 15:48:12.115452070 +0800 @@ -389,3 +389,3 @@ static void xopenlog(BIO *bp, char *name # else - openlog(name, LOG_PID | LOG_CONS, level); @@ -61,9 +51,9 @@ git diff -Nur -p1 a/OpenSSL_1_1_0e/crypto/bio/bss_log.c b/OpenSSL_1_1_0e/crypto/ - closelog(); + //closelog(); } -git diff -Nur -p1 a/OpenSSL_1_1_0e/crypto/buildinf.h b/OpenSSL_1_1_0e/crypto/buildinf.h +diff -Nur -p1 a/OpenSSL_1_1_0e/crypto/buildinf.h b/OpenSSL_1_1_0e/crypto/buildinf.h --- a/OpenSSL_1_1_0e/crypto/buildinf.h 1970-01-01 08:00:00.000000000 +0800 -+++ b/OpenSSL_1_1_0e/crypto/buildinf.h 2021-03-22 11:52:44.453197299 +0800 ++++ b/OpenSSL_1_1_0e/crypto/buildinf.h 2021-06-30 15:48:12.115452070 +0800 @@ -0,0 +1,30 @@ +/* auto-generated by util/mkbuildinf.pl for crypto/cversion.c */ +#define CFLAGS cflags @@ -95,7 +85,7 @@ git diff -Nur -p1 a/OpenSSL_1_1_0e/crypto/buildinf.h b/OpenSSL_1_1_0e/crypto/bui +}; +#define PLATFORM "platform: android-armeabi" +#define DATE "built on: Thu May 25 15:38:05 2017" -git diff -Nur -p1 a/OpenSSL_1_1_0e/crypto/ec/ecp_nistz256_table.c b/OpenSSL_1_1_0e/crypto/ec/ecp_nistz256_table.c +diff -Nur -p1 a/OpenSSL_1_1_0e/crypto/ec/ecp_nistz256_table.c b/OpenSSL_1_1_0e/crypto/ec/ecp_nistz256_table.c --- a/OpenSSL_1_1_0e/crypto/ec/ecp_nistz256_table.c 2017-02-16 19:58:19.000000000 +0800 +++ b/OpenSSL_1_1_0e/crypto/ec/ecp_nistz256_table.c 1970-01-01 08:00:00.000000000 +0800 @@ -1,9542 +0,0 @@ @@ -9641,9 +9631,9 @@ git diff -Nur -p1 a/OpenSSL_1_1_0e/crypto/ec/ecp_nistz256_table.c b/OpenSSL_1_1_ - TOBN(0xd6baef61, 0x3f714aa1), TOBN(0xf51865ad, 0xeb78795e), - TOBN(0xd3e21fce, 0xe6a9d694), TOBN(0x82ceb1dd, 0x8a37b527)} -}; -git diff -Nur -p1 a/OpenSSL_1_1_0e/crypto/include/internal/bn_conf.h b/OpenSSL_1_1_0e/crypto/include/internal/bn_conf.h +diff -Nur -p1 a/OpenSSL_1_1_0e/crypto/include/internal/bn_conf.h b/OpenSSL_1_1_0e/crypto/include/internal/bn_conf.h --- a/OpenSSL_1_1_0e/crypto/include/internal/bn_conf.h 1970-01-01 08:00:00.000000000 +0800 -+++ b/OpenSSL_1_1_0e/crypto/include/internal/bn_conf.h 2021-03-22 11:52:44.469197299 +0800 ++++ b/OpenSSL_1_1_0e/crypto/include/internal/bn_conf.h 2021-06-30 15:48:12.123451854 +0800 @@ -0,0 +1,28 @@ +/* WARNING: do not edit! */ +/* Generated by Makefile from ../crypto/include/internal/bn_conf.h.in */ @@ -9673,9 +9663,9 @@ git diff -Nur -p1 a/OpenSSL_1_1_0e/crypto/include/internal/bn_conf.h b/OpenSSL_1 +#define THIRTY_TWO_BIT + +#endif -git diff -Nur -p1 a/OpenSSL_1_1_0e/crypto/include/internal/dso_conf.h b/OpenSSL_1_1_0e/crypto/include/internal/dso_conf.h +diff -Nur -p1 a/OpenSSL_1_1_0e/crypto/include/internal/dso_conf.h b/OpenSSL_1_1_0e/crypto/include/internal/dso_conf.h --- a/OpenSSL_1_1_0e/crypto/include/internal/dso_conf.h 1970-01-01 08:00:00.000000000 +0800 -+++ b/OpenSSL_1_1_0e/crypto/include/internal/dso_conf.h 2021-03-22 11:52:44.469197299 +0800 ++++ b/OpenSSL_1_1_0e/crypto/include/internal/dso_conf.h 2021-06-30 15:48:12.123451854 +0800 @@ -0,0 +1,16 @@ +/* WARNING: do not edit! */ +/* Generated by Makefile from ../crypto/include/internal/dso_conf.h.in */ @@ -9693,9 +9683,9 @@ git diff -Nur -p1 a/OpenSSL_1_1_0e/crypto/include/internal/dso_conf.h b/OpenSSL_ + +# define DSO_EXTENSION ".so" +#endif -git diff -Nur -p1 a/OpenSSL_1_1_0e/crypto/init.c b/OpenSSL_1_1_0e/crypto/init.c +diff -Nur -p1 a/OpenSSL_1_1_0e/crypto/init.c b/OpenSSL_1_1_0e/crypto/init.c --- a/OpenSSL_1_1_0e/crypto/init.c 2017-02-16 19:58:19.000000000 +0800 -+++ b/OpenSSL_1_1_0e/crypto/init.c 2021-03-22 11:52:44.453197299 +0800 ++++ b/OpenSSL_1_1_0e/crypto/init.c 2021-06-30 15:48:12.131451640 +0800 @@ -277,6 +277,6 @@ DEFINE_RUN_ONCE_STATIC(ossl_init_engine_ # ifdef OPENSSL_INIT_DEBUG - fprintf(stderr, "OPENSSL_INIT: ossl_init_engine_padlock: " @@ -9706,721 +9696,9 @@ git diff -Nur -p1 a/OpenSSL_1_1_0e/crypto/init.c b/OpenSSL_1_1_0e/crypto/init.c - engine_load_padlock_int(); +// engine_load_padlock_int(); return 1; -git diff -Nur -p1 a/OpenSSL_1_1_0e/crypto/LPdir_nyi.c b/OpenSSL_1_1_0e/crypto/LPdir_nyi.c ---- a/OpenSSL_1_1_0e/crypto/LPdir_nyi.c 2017-02-16 19:58:19.000000000 +0800 -+++ b/OpenSSL_1_1_0e/crypto/LPdir_nyi.c 1970-01-01 08:00:00.000000000 +0800 -@@ -1,53 +0,0 @@ --/* -- * Copyright 2004-2016 The OpenSSL Project Authors. All Rights Reserved. -- * -- * Licensed under the OpenSSL license (the "License"). You may not use -- * this file except in compliance with the License. You can obtain a copy -- * in the file LICENSE in the source distribution or at -- * https://www.openssl.org/source/license.html -- */ -- --/* -- * Copyright (c) 2004, Richard Levitte -- * All rights reserved. -- * -- * Redistribution and use in source and binary forms, with or without -- * modification, are permitted provided that the following conditions -- * are met: -- * 1. Redistributions of source code must retain the above copyright -- * notice, this list of conditions and the following disclaimer. -- * 2. Redistributions in binary form must reproduce the above copyright -- * notice, this list of conditions and the following disclaimer in the -- * documentation and/or other materials provided with the distribution. -- * -- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND -- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -- * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE -- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -- * SUCH DAMAGE. -- */ -- --#ifndef LPDIR_H --# include "LPdir.h" --#endif -- --struct LP_dir_context_st { -- void *dummy; --}; --const char *LP_find_file(LP_DIR_CTX **ctx, const char *directory) --{ -- errno = EINVAL; -- return 0; --} -- --int LP_find_file_end(LP_DIR_CTX **ctx) --{ -- errno = EINVAL; -- return 0; --} -git diff -Nur -p1 a/OpenSSL_1_1_0e/crypto/LPdir_unix.c b/OpenSSL_1_1_0e/crypto/LPdir_unix.c ---- a/OpenSSL_1_1_0e/crypto/LPdir_unix.c 2017-02-16 19:58:19.000000000 +0800 -+++ b/OpenSSL_1_1_0e/crypto/LPdir_unix.c 1970-01-01 08:00:00.000000000 +0800 -@@ -1,131 +0,0 @@ --/* -- * Copyright 2004-2016 The OpenSSL Project Authors. All Rights Reserved. -- * -- * Licensed under the OpenSSL license (the "License"). You may not use -- * this file except in compliance with the License. You can obtain a copy -- * in the file LICENSE in the source distribution or at -- * https://www.openssl.org/source/license.html -- */ -- --/* -- * Copyright (c) 2004, Richard Levitte -- * All rights reserved. -- * -- * Redistribution and use in source and binary forms, with or without -- * modification, are permitted provided that the following conditions -- * are met: -- * 1. Redistributions of source code must retain the above copyright -- * notice, this list of conditions and the following disclaimer. -- * 2. Redistributions in binary form must reproduce the above copyright -- * notice, this list of conditions and the following disclaimer in the -- * documentation and/or other materials provided with the distribution. -- * -- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -- */ -- --#include --#include --#include --#include --#include --#include --#include --#ifndef LPDIR_H --# include "LPdir.h" --#endif -- --/* -- * The POSIXly macro for the maximum number of characters in a file path is -- * NAME_MAX. However, some operating systems use PATH_MAX instead. -- * Therefore, it seems natural to first check for PATH_MAX and use that, and -- * if it doesn't exist, use NAME_MAX. -- */ --#if defined(PATH_MAX) --# define LP_ENTRY_SIZE PATH_MAX --#elif defined(NAME_MAX) --# define LP_ENTRY_SIZE NAME_MAX --#endif -- --/* -- * Of course, there's the possibility that neither PATH_MAX nor NAME_MAX -- * exist. It's also possible that NAME_MAX exists but is define to a very -- * small value (HP-UX offers 14), so we need to check if we got a result, and -- * if it meets a minimum standard, and create or change it if not. -- */ --#if !defined(LP_ENTRY_SIZE) || LP_ENTRY_SIZE<255 --# undef LP_ENTRY_SIZE --# define LP_ENTRY_SIZE 255 --#endif -- --struct LP_dir_context_st { -- DIR *dir; -- char entry_name[LP_ENTRY_SIZE + 1]; --}; -- --const char *LP_find_file(LP_DIR_CTX **ctx, const char *directory) --{ -- struct dirent *direntry = NULL; -- -- if (ctx == NULL || directory == NULL) { -- errno = EINVAL; -- return 0; -- } -- -- errno = 0; -- if (*ctx == NULL) { -- *ctx = malloc(sizeof(**ctx)); -- if (*ctx == NULL) { -- errno = ENOMEM; -- return 0; -- } -- memset(*ctx, 0, sizeof(**ctx)); -- -- (*ctx)->dir = opendir(directory); -- if ((*ctx)->dir == NULL) { -- int save_errno = errno; /* Probably not needed, but I'm paranoid */ -- free(*ctx); -- *ctx = NULL; -- errno = save_errno; -- return 0; -- } -- } -- -- direntry = readdir((*ctx)->dir); -- if (direntry == NULL) { -- return 0; -- } -- -- strncpy((*ctx)->entry_name, direntry->d_name, -- sizeof((*ctx)->entry_name) - 1); -- (*ctx)->entry_name[sizeof((*ctx)->entry_name) - 1] = '\0'; -- return (*ctx)->entry_name; --} -- --int LP_find_file_end(LP_DIR_CTX **ctx) --{ -- if (ctx != NULL && *ctx != NULL) { -- int ret = closedir((*ctx)->dir); -- -- free(*ctx); -- switch (ret) { -- case 0: -- return 1; -- case -1: -- return 0; -- default: -- break; -- } -- } -- errno = EINVAL; -- return 0; --} -git diff -Nur -p1 a/OpenSSL_1_1_0e/crypto/LPdir_vms.c b/OpenSSL_1_1_0e/crypto/LPdir_vms.c ---- a/OpenSSL_1_1_0e/crypto/LPdir_vms.c 2017-02-16 19:58:19.000000000 +0800 -+++ b/OpenSSL_1_1_0e/crypto/LPdir_vms.c 1970-01-01 08:00:00.000000000 +0800 -@@ -1,204 +0,0 @@ --/* -- * Copyright 2004-2016 The OpenSSL Project Authors. All Rights Reserved. -- * -- * Licensed under the OpenSSL license (the "License"). You may not use -- * this file except in compliance with the License. You can obtain a copy -- * in the file LICENSE in the source distribution or at -- * https://www.openssl.org/source/license.html -- */ -- --/* -- * Copyright (c) 2004, Richard Levitte -- * All rights reserved. -- * -- * Redistribution and use in source and binary forms, with or without -- * modification, are permitted provided that the following conditions -- * are met: -- * 1. Redistributions of source code must retain the above copyright -- * notice, this list of conditions and the following disclaimer. -- * 2. Redistributions in binary form must reproduce the above copyright -- * notice, this list of conditions and the following disclaimer in the -- * documentation and/or other materials provided with the distribution. -- * -- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -- */ -- --#include --#include --#include --#include --#include --#include --#include --#include --#include --#include --#include --#include --#ifndef LPDIR_H --# include "LPdir.h" --#endif --#include "vms_rms.h" -- --/* Some compiler options hide EVMSERR. */ --#ifndef EVMSERR --# define EVMSERR 65535 /* error for non-translatable VMS errors */ --#endif -- --struct LP_dir_context_st { -- unsigned long VMS_context; -- char filespec[NAMX_MAXRSS + 1]; -- char result[NAMX_MAXRSS + 1]; -- struct dsc$descriptor_d filespec_dsc; -- struct dsc$descriptor_d result_dsc; --}; -- --const char *LP_find_file(LP_DIR_CTX **ctx, const char *directory) --{ -- int status; -- char *p, *r; -- size_t l; -- unsigned long flags = 0; -- --/* Arrange 32-bit pointer to (copied) string storage, if needed. */ --#if __INITIAL_POINTER_SIZE == 64 --# pragma pointer_size save --# pragma pointer_size 32 -- char *ctx_filespec_32p; --# pragma pointer_size restore -- char ctx_filespec_32[NAMX_MAXRSS + 1]; --#endif /* __INITIAL_POINTER_SIZE == 64 */ -- --#ifdef NAML$C_MAXRSS -- flags |= LIB$M_FIL_LONG_NAMES; --#endif -- -- if (ctx == NULL || directory == NULL) { -- errno = EINVAL; -- return 0; -- } -- -- errno = 0; -- if (*ctx == NULL) { -- size_t filespeclen = strlen(directory); -- char *filespec = NULL; -- -- if (filespeclen == 0) { -- errno = ENOENT; -- return 0; -- } -- -- /* MUST be a VMS directory specification! Let's estimate if it is. */ -- if (directory[filespeclen - 1] != ']' -- && directory[filespeclen - 1] != '>' -- && directory[filespeclen - 1] != ':') { -- errno = EINVAL; -- return 0; -- } -- -- filespeclen += 4; /* "*.*;" */ -- -- if (filespeclen > NAMX_MAXRSS) { -- errno = ENAMETOOLONG; -- return 0; -- } -- -- *ctx = malloc(sizeof(**ctx)); -- if (*ctx == NULL) { -- errno = ENOMEM; -- return 0; -- } -- memset(*ctx, 0, sizeof(**ctx)); -- -- strcpy((*ctx)->filespec, directory); -- strcat((*ctx)->filespec, "*.*;"); -- --/* Arrange 32-bit pointer to (copied) string storage, if needed. */ --#if __INITIAL_POINTER_SIZE == 64 --# define CTX_FILESPEC ctx_filespec_32p -- /* Copy the file name to storage with a 32-bit pointer. */ -- ctx_filespec_32p = ctx_filespec_32; -- strcpy(ctx_filespec_32p, (*ctx)->filespec); --#else /* __INITIAL_POINTER_SIZE == 64 */ --# define CTX_FILESPEC (*ctx)->filespec --#endif /* __INITIAL_POINTER_SIZE == 64 [else] */ -- -- (*ctx)->filespec_dsc.dsc$w_length = filespeclen; -- (*ctx)->filespec_dsc.dsc$b_dtype = DSC$K_DTYPE_T; -- (*ctx)->filespec_dsc.dsc$b_class = DSC$K_CLASS_S; -- (*ctx)->filespec_dsc.dsc$a_pointer = CTX_FILESPEC; -- } -- -- (*ctx)->result_dsc.dsc$w_length = 0; -- (*ctx)->result_dsc.dsc$b_dtype = DSC$K_DTYPE_T; -- (*ctx)->result_dsc.dsc$b_class = DSC$K_CLASS_D; -- (*ctx)->result_dsc.dsc$a_pointer = 0; -- -- status = lib$find_file(&(*ctx)->filespec_dsc, &(*ctx)->result_dsc, -- &(*ctx)->VMS_context, 0, 0, 0, &flags); -- -- if (status == RMS$_NMF) { -- errno = 0; -- vaxc$errno = status; -- return NULL; -- } -- -- if (!$VMS_STATUS_SUCCESS(status)) { -- errno = EVMSERR; -- vaxc$errno = status; -- return NULL; -- } -- -- /* -- * Quick, cheap and dirty way to discard any device and directory, since -- * we only want file names -- */ -- l = (*ctx)->result_dsc.dsc$w_length; -- p = (*ctx)->result_dsc.dsc$a_pointer; -- r = p; -- for (; *p; p++) { -- if (*p == '^' && p[1] != '\0') { /* Take care of ODS-5 escapes */ -- p++; -- } else if (*p == ':' || *p == '>' || *p == ']') { -- l -= p + 1 - r; -- r = p + 1; -- } else if (*p == ';') { -- l = p - r; -- break; -- } -- } -- -- strncpy((*ctx)->result, r, l); -- (*ctx)->result[l] = '\0'; -- str$free1_dx(&(*ctx)->result_dsc); -- -- return (*ctx)->result; --} -- --int LP_find_file_end(LP_DIR_CTX **ctx) --{ -- if (ctx != NULL && *ctx != NULL) { -- int status = lib$find_file_end(&(*ctx)->VMS_context); -- -- free(*ctx); -- -- if (!$VMS_STATUS_SUCCESS(status)) { -- errno = EVMSERR; -- vaxc$errno = status; -- return 0; -- } -- return 1; -- } -- errno = EINVAL; -- return 0; --} -git diff -Nur -p1 a/OpenSSL_1_1_0e/crypto/LPdir_win32.c b/OpenSSL_1_1_0e/crypto/LPdir_win32.c ---- a/OpenSSL_1_1_0e/crypto/LPdir_win32.c 2017-02-16 19:58:19.000000000 +0800 -+++ b/OpenSSL_1_1_0e/crypto/LPdir_win32.c 1970-01-01 08:00:00.000000000 +0800 -@@ -1,38 +0,0 @@ --/* -- * Copyright 2004-2016 The OpenSSL Project Authors. All Rights Reserved. -- * -- * Licensed under the OpenSSL license (the "License"). You may not use -- * this file except in compliance with the License. You can obtain a copy -- * in the file LICENSE in the source distribution or at -- * https://www.openssl.org/source/license.html -- */ -- --/* -- * Copyright (c) 2004, Richard Levitte -- * All rights reserved. -- * -- * Redistribution and use in source and binary forms, with or without -- * modification, are permitted provided that the following conditions -- * are met: -- * 1. Redistributions of source code must retain the above copyright -- * notice, this list of conditions and the following disclaimer. -- * 2. Redistributions in binary form must reproduce the above copyright -- * notice, this list of conditions and the following disclaimer in the -- * documentation and/or other materials provided with the distribution. -- * -- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -- */ -- --#define LP_SYS_WIN32 --#define LP_MULTIBYTE_AVAILABLE --#include "LPdir_win.c" -git diff -Nur -p1 a/OpenSSL_1_1_0e/crypto/LPdir_win.c b/OpenSSL_1_1_0e/crypto/LPdir_win.c ---- a/OpenSSL_1_1_0e/crypto/LPdir_win.c 2017-02-16 19:58:19.000000000 +0800 -+++ b/OpenSSL_1_1_0e/crypto/LPdir_win.c 1970-01-01 08:00:00.000000000 +0800 -@@ -1,211 +0,0 @@ --/* -- * Copyright 2004-2016 The OpenSSL Project Authors. All Rights Reserved. -- * -- * Licensed under the OpenSSL license (the "License"). You may not use -- * this file except in compliance with the License. You can obtain a copy -- * in the file LICENSE in the source distribution or at -- * https://www.openssl.org/source/license.html -- */ -- --/* -- * Copyright (c) 2004, Richard Levitte -- * All rights reserved. -- * -- * Redistribution and use in source and binary forms, with or without -- * modification, are permitted provided that the following conditions -- * are met: -- * 1. Redistributions of source code must retain the above copyright -- * notice, this list of conditions and the following disclaimer. -- * 2. Redistributions in binary form must reproduce the above copyright -- * notice, this list of conditions and the following disclaimer in the -- * documentation and/or other materials provided with the distribution. -- * -- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -- */ -- --#include --#include --#include "internal/numbers.h" --#ifndef LPDIR_H --# include "LPdir.h" --#endif -- --/* -- * We're most likely overcautious here, but let's reserve for broken WinCE -- * headers and explicitly opt for UNICODE call. Keep in mind that our WinCE -- * builds are compiled with -DUNICODE [as well as -D_UNICODE]. -- */ --#if defined(LP_SYS_WINCE) && !defined(FindFirstFile) --# define FindFirstFile FindFirstFileW --#endif --#if defined(LP_SYS_WINCE) && !defined(FindNextFile) --# define FindNextFile FindNextFileW --#endif -- --#ifndef NAME_MAX --# define NAME_MAX 255 --#endif -- --#ifdef CP_UTF8 --# define CP_DEFAULT CP_UTF8 --#else --# define CP_DEFAULT CP_ACP --#endif -- --struct LP_dir_context_st { -- WIN32_FIND_DATA ctx; -- HANDLE handle; -- char entry_name[NAME_MAX + 1]; --}; -- --const char *LP_find_file(LP_DIR_CTX **ctx, const char *directory) --{ -- if (ctx == NULL || directory == NULL) { -- errno = EINVAL; -- return 0; -- } -- -- errno = 0; -- if (*ctx == NULL) { -- size_t dirlen = strlen(directory); -- -- if (dirlen == 0 || dirlen > INT_MAX - 3) { -- errno = ENOENT; -- return 0; -- } -- -- *ctx = malloc(sizeof(**ctx)); -- if (*ctx == NULL) { -- errno = ENOMEM; -- return 0; -- } -- memset(*ctx, 0, sizeof(**ctx)); -- -- if (sizeof(TCHAR) != sizeof(char)) { -- TCHAR *wdir = NULL; -- /* len_0 denotes string length *with* trailing 0 */ -- size_t index = 0, len_0 = dirlen + 1; --#ifdef LP_MULTIBYTE_AVAILABLE -- int sz = 0; -- UINT cp; -- -- do { --# ifdef CP_UTF8 -- if ((sz = MultiByteToWideChar((cp = CP_UTF8), 0, -- directory, len_0, -- NULL, 0)) > 0 || -- GetLastError() != ERROR_NO_UNICODE_TRANSLATION) -- break; --# endif -- sz = MultiByteToWideChar((cp = CP_ACP), 0, -- directory, len_0, -- NULL, 0); -- } while (0); -- -- if (sz > 0) { -- /* -- * allocate two additional characters in case we need to -- * concatenate asterisk, |sz| covers trailing '\0'! -- */ -- wdir = _alloca((sz + 2) * sizeof(TCHAR)); -- if (!MultiByteToWideChar(cp, 0, directory, len_0, -- (WCHAR *)wdir, sz)) { -- free(*ctx); -- *ctx = NULL; -- errno = EINVAL; -- return 0; -- } -- } else --#endif -- { -- sz = len_0; -- /* -- * allocate two additional characters in case we need to -- * concatenate asterisk, |sz| covers trailing '\0'! -- */ -- wdir = _alloca((sz + 2) * sizeof(TCHAR)); -- for (index = 0; index < len_0; index++) -- wdir[index] = (TCHAR)directory[index]; -- } -- -- sz--; /* wdir[sz] is trailing '\0' now */ -- if (wdir[sz - 1] != TEXT('*')) { -- if (wdir[sz - 1] != TEXT('/') && wdir[sz - 1] != TEXT('\\')) -- _tcscpy(wdir + sz, TEXT("/*")); -- else -- _tcscpy(wdir + sz, TEXT("*")); -- } -- -- (*ctx)->handle = FindFirstFile(wdir, &(*ctx)->ctx); -- } else { -- if (directory[dirlen - 1] != '*') { -- char *buf = _alloca(dirlen + 3); -- -- strcpy(buf, directory); -- if (buf[dirlen - 1] != '/' && buf[dirlen - 1] != '\\') -- strcpy(buf + dirlen, "/*"); -- else -- strcpy(buf + dirlen, "*"); -- -- directory = buf; -- } -- -- (*ctx)->handle = FindFirstFile((TCHAR *)directory, &(*ctx)->ctx); -- } -- -- if ((*ctx)->handle == INVALID_HANDLE_VALUE) { -- free(*ctx); -- *ctx = NULL; -- errno = EINVAL; -- return 0; -- } -- } else { -- if (FindNextFile((*ctx)->handle, &(*ctx)->ctx) == FALSE) { -- return 0; -- } -- } -- if (sizeof(TCHAR) != sizeof(char)) { -- TCHAR *wdir = (*ctx)->ctx.cFileName; -- size_t index, len_0 = 0; -- -- while (wdir[len_0] && len_0 < (sizeof((*ctx)->entry_name) - 1)) -- len_0++; -- len_0++; -- --#ifdef LP_MULTIBYTE_AVAILABLE -- if (!WideCharToMultiByte(CP_DEFAULT, 0, (WCHAR *)wdir, len_0, -- (*ctx)->entry_name, -- sizeof((*ctx)->entry_name), NULL, 0)) --#endif -- for (index = 0; index < len_0; index++) -- (*ctx)->entry_name[index] = (char)wdir[index]; -- } else -- strncpy((*ctx)->entry_name, (const char *)(*ctx)->ctx.cFileName, -- sizeof((*ctx)->entry_name) - 1); -- -- (*ctx)->entry_name[sizeof((*ctx)->entry_name) - 1] = '\0'; -- -- return (*ctx)->entry_name; --} -- --int LP_find_file_end(LP_DIR_CTX **ctx) --{ -- if (ctx != NULL && *ctx != NULL) { -- FindClose((*ctx)->handle); -- free(*ctx); -- *ctx = NULL; -- return 1; -- } -- errno = EINVAL; -- return 0; --} -git diff -Nur -p1 a/OpenSSL_1_1_0e/crypto/LPdir_wince.c b/OpenSSL_1_1_0e/crypto/LPdir_wince.c ---- a/OpenSSL_1_1_0e/crypto/LPdir_wince.c 2017-02-16 19:58:19.000000000 +0800 -+++ b/OpenSSL_1_1_0e/crypto/LPdir_wince.c 1970-01-01 08:00:00.000000000 +0800 -@@ -1,41 +0,0 @@ --/* -- * Copyright 2004-2016 The OpenSSL Project Authors. All Rights Reserved. -- * -- * Licensed under the OpenSSL license (the "License"). You may not use -- * this file except in compliance with the License. You can obtain a copy -- * in the file LICENSE in the source distribution or at -- * https://www.openssl.org/source/license.html -- */ -- --/* -- * Copyright (c) 2004, Richard Levitte -- * All rights reserved. -- * -- * Redistribution and use in source and binary forms, with or without -- * modification, are permitted provided that the following conditions -- * are met: -- * 1. Redistributions of source code must retain the above copyright -- * notice, this list of conditions and the following disclaimer. -- * 2. Redistributions in binary form must reproduce the above copyright -- * notice, this list of conditions and the following disclaimer in the -- * documentation and/or other materials provided with the distribution. -- * -- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -- */ -- --#define LP_SYS_WINCE --/* -- * We might want to define LP_MULTIBYTE_AVAILABLE here. It's currently under -- * investigation what the exact conditions would be -- */ --#include "LPdir_win.c" -git diff -Nur -p1 a/OpenSSL_1_1_0e/crypto/o_dir.c b/OpenSSL_1_1_0e/crypto/o_dir.c ---- a/OpenSSL_1_1_0e/crypto/o_dir.c 2017-02-16 19:58:19.000000000 +0800 -+++ b/OpenSSL_1_1_0e/crypto/o_dir.c 2021-03-22 11:52:44.453197299 +0800 -@@ -24,2 +24,3 @@ - -+#ifndef __LITEOS__ - #define LPDIR_H -@@ -36 +37,2 @@ - #endif -+#endif -git diff -Nur -p1 a/OpenSSL_1_1_0e/crypto/o_str.c b/OpenSSL_1_1_0e/crypto/o_str.c +diff -Nur -p1 a/OpenSSL_1_1_0e/crypto/o_str.c b/OpenSSL_1_1_0e/crypto/o_str.c --- a/OpenSSL_1_1_0e/crypto/o_str.c 2017-02-16 19:58:19.000000000 +0800 -+++ b/OpenSSL_1_1_0e/crypto/o_str.c 2021-03-22 11:52:44.453197299 +0800 ++++ b/OpenSSL_1_1_0e/crypto/o_str.c 2021-06-30 15:48:12.123451854 +0800 @@ -228,3 +228,7 @@ int openssl_strerror_r(int errnum, char #elif defined(_GNU_SOURCE) +#ifdef __LITEOS__ @@ -10429,18 +9707,18 @@ git diff -Nur -p1 a/OpenSSL_1_1_0e/crypto/o_str.c b/OpenSSL_1_1_0e/crypto/o_str. return strerror_r(errnum, buf, buflen) != NULL; +#endif #elif (_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600) -git diff -Nur -p1 a/OpenSSL_1_1_0e/crypto/pkcs7/pk7_enc.c b/OpenSSL_1_1_0e/crypto/pkcs7/pk7_enc.c +diff -Nur -p1 a/OpenSSL_1_1_0e/crypto/pkcs7/pk7_enc.c b/OpenSSL_1_1_0e/crypto/pkcs7/pk7_enc.c --- a/OpenSSL_1_1_0e/crypto/pkcs7/pk7_enc.c 2017-02-16 19:58:19.000000000 +0800 -+++ b/OpenSSL_1_1_0e/crypto/pkcs7/pk7_enc.c 2021-03-22 11:52:44.473197299 +0800 ++++ b/OpenSSL_1_1_0e/crypto/pkcs7/pk7_enc.c 2021-06-30 15:48:12.127451747 +0800 @@ -19,3 +19,5 @@ PKCS7_out_bio(PKCS7 *p7, BIO *out); +#ifndef __LITEOS__ PKCS7_add_signer(PKCS7 *p7, X509 *cert, EVP_PKEY *key); +#endif PKCS7_cipher(PKCS7 *p7, EVP_CIPHER *cipher); -git diff -Nur -p1 a/OpenSSL_1_1_0e/crypto/poly1305/poly1305_ieee754.c b/OpenSSL_1_1_0e/crypto/poly1305/poly1305_ieee754.c +diff -Nur -p1 a/OpenSSL_1_1_0e/crypto/poly1305/poly1305_ieee754.c b/OpenSSL_1_1_0e/crypto/poly1305/poly1305_ieee754.c --- a/OpenSSL_1_1_0e/crypto/poly1305/poly1305_ieee754.c 2017-02-16 19:58:19.000000000 +0800 -+++ b/OpenSSL_1_1_0e/crypto/poly1305/poly1305_ieee754.c 2021-03-22 11:52:44.473197299 +0800 ++++ b/OpenSSL_1_1_0e/crypto/poly1305/poly1305_ieee754.c 2021-06-30 15:48:12.127451747 +0800 @@ -104,4 +104,6 @@ static const u64 fsr = 1ULL<<30; #else +#ifndef __LITEOS__ @@ -10448,17 +9726,17 @@ git diff -Nur -p1 a/OpenSSL_1_1_0e/crypto/poly1305/poly1305_ieee754.c b/OpenSSL_ #endif +#endif -git diff -Nur -p1 a/OpenSSL_1_1_0e/crypto/ppccap.c b/OpenSSL_1_1_0e/crypto/ppccap.c +diff -Nur -p1 a/OpenSSL_1_1_0e/crypto/ppccap.c b/OpenSSL_1_1_0e/crypto/ppccap.c --- a/OpenSSL_1_1_0e/crypto/ppccap.c 2017-02-16 19:58:19.000000000 +0800 -+++ b/OpenSSL_1_1_0e/crypto/ppccap.c 2021-03-22 11:52:44.453197299 +0800 ++++ b/OpenSSL_1_1_0e/crypto/ppccap.c 2021-06-30 15:48:12.127451747 +0800 @@ -90,3 +90,3 @@ void sha512_block_data_order(void *ctx, -#ifndef OPENSSL_NO_CHACHA +#ifdef OPENSSL_NO_CHACHA void ChaCha20_ctr32_int(unsigned char *out, const unsigned char *inp, -git diff -Nur -p1 a/OpenSSL_1_1_0e/crypto/rand/rand_unix.c b/OpenSSL_1_1_0e/crypto/rand/rand_unix.c +diff -Nur -p1 a/OpenSSL_1_1_0e/crypto/rand/rand_unix.c b/OpenSSL_1_1_0e/crypto/rand/rand_unix.c --- a/OpenSSL_1_1_0e/crypto/rand/rand_unix.c 2017-02-16 19:58:19.000000000 +0800 -+++ b/OpenSSL_1_1_0e/crypto/rand/rand_unix.c 2021-03-22 11:52:44.477197299 +0800 ++++ b/OpenSSL_1_1_0e/crypto/rand/rand_unix.c 2021-06-30 15:48:12.127451747 +0800 @@ -236,3 +236,3 @@ int RAND_poll(void) FD_SET(fd, &fset); - @@ -10474,16 +9752,16 @@ git diff -Nur -p1 a/OpenSSL_1_1_0e/crypto/rand/rand_unix.c b/OpenSSL_1_1_0e/cryp l = getuid(); +#endif RAND_add(&l, sizeof(l), 0.0); -git diff -Nur -p1 a/OpenSSL_1_1_0e/crypto/rsa/rsa_ameth.c b/OpenSSL_1_1_0e/crypto/rsa/rsa_ameth.c +diff -Nur -p1 a/OpenSSL_1_1_0e/crypto/rsa/rsa_ameth.c b/OpenSSL_1_1_0e/crypto/rsa/rsa_ameth.c --- a/OpenSSL_1_1_0e/crypto/rsa/rsa_ameth.c 2017-02-16 19:58:19.000000000 +0800 -+++ b/OpenSSL_1_1_0e/crypto/rsa/rsa_ameth.c 2021-03-22 11:52:44.477197299 +0800 ++++ b/OpenSSL_1_1_0e/crypto/rsa/rsa_ameth.c 2021-06-30 15:48:12.127451747 +0800 @@ -15,2 +15,3 @@ #include +#include #include "internal/asn1_int.h" -git diff -Nur -p1 a/OpenSSL_1_1_0e/crypto/ui/ui_openssl.c b/OpenSSL_1_1_0e/crypto/ui/ui_openssl.c +diff -Nur -p1 a/OpenSSL_1_1_0e/crypto/ui/ui_openssl.c b/OpenSSL_1_1_0e/crypto/ui/ui_openssl.c --- a/OpenSSL_1_1_0e/crypto/ui/ui_openssl.c 2017-02-16 19:58:19.000000000 +0800 -+++ b/OpenSSL_1_1_0e/crypto/ui/ui_openssl.c 2021-03-22 11:52:44.477197299 +0800 ++++ b/OpenSSL_1_1_0e/crypto/ui/ui_openssl.c 2021-06-30 15:48:12.127451747 +0800 @@ -269,7 +269,7 @@ static int read_till_nl(FILE *in) { -# define SIZE 4 @@ -10505,39 +9783,20 @@ git diff -Nur -p1 a/OpenSSL_1_1_0e/crypto/ui/ui_openssl.c b/OpenSSL_1_1_0e/crypt - sigaction(i, &savsig[i], NULL); +// sigaction(i, &savsig[i], NULL); # else -git diff -Nur -p1 a/OpenSSL_1_1_0e/crypto/x509v3/tabtest.c b/OpenSSL_1_1_0e/crypto/x509v3/tabtest.c ---- a/OpenSSL_1_1_0e/crypto/x509v3/tabtest.c 2017-02-16 19:58:19.000000000 +0800 -+++ b/OpenSSL_1_1_0e/crypto/x509v3/tabtest.c 2021-03-22 11:52:44.481197299 +0800 -@@ -20,2 +20,3 @@ - -+#ifndef __LITEOS__ - main() -@@ -42 +43,2 @@ main() - } -+#endif -git diff -Nur -p1 a/OpenSSL_1_1_0e/crypto/x509v3/v3conf.c b/OpenSSL_1_1_0e/crypto/x509v3/v3conf.c ---- a/OpenSSL_1_1_0e/crypto/x509v3/v3conf.c 2017-02-16 19:58:19.000000000 +0800 -+++ b/OpenSSL_1_1_0e/crypto/x509v3/v3conf.c 2021-03-22 11:52:44.481197299 +0800 -@@ -18,2 +18,3 @@ - -+#ifndef __LITEOS__ - int main(int argc, char **argv) -@@ -79 +80,2 @@ int main(int argc, char **argv) - } -+#endif -git diff -Nur -p1 a/OpenSSL_1_1_0e/crypto/x509v3/v3prin.c b/OpenSSL_1_1_0e/crypto/x509v3/v3prin.c ---- a/OpenSSL_1_1_0e/crypto/x509v3/v3prin.c 2017-02-16 19:58:19.000000000 +0800 -+++ b/OpenSSL_1_1_0e/crypto/x509v3/v3prin.c 2021-03-22 11:52:44.481197299 +0800 -@@ -15,2 +15,3 @@ - -+#ifndef __LITEOS__ - int main(int argc, char **argv) -@@ -50 +51,2 @@ int main(int argc, char **argv) - } +diff -Nur -p1 a/OpenSSL_1_1_0e/crypto/uid.c b/OpenSSL_1_1_0e/crypto/uid.c +--- a/OpenSSL_1_1_0e/crypto/uid.c 2017-02-16 19:58:19.000000000 +0800 ++++ b/OpenSSL_1_1_0e/crypto/uid.c 2021-06-30 15:48:12.127451747 +0800 +@@ -35,2 +35,3 @@ int OPENSSL_issetugid(void) + { ++#if 0 + if (getuid() != geteuid()) +@@ -39,2 +40,3 @@ int OPENSSL_issetugid(void) + return 1; +#endif -git diff -Nur -p1 a/OpenSSL_1_1_0e/e_os.h b/OpenSSL_1_1_0e/e_os.h + return 0; +diff -Nur -p1 a/OpenSSL_1_1_0e/e_os.h b/OpenSSL_1_1_0e/e_os.h --- a/OpenSSL_1_1_0e/e_os.h 2017-02-16 19:58:19.000000000 +0800 -+++ b/OpenSSL_1_1_0e/e_os.h 2021-03-22 11:52:44.445197298 +0800 ++++ b/OpenSSL_1_1_0e/e_os.h 2021-06-30 15:48:12.111452178 +0800 @@ -15,2 +15,3 @@ # include +#undef AF_INET6 @@ -10558,9 +9817,9 @@ git diff -Nur -p1 a/OpenSSL_1_1_0e/e_os.h b/OpenSSL_1_1_0e/e_os.h -# define OPENSSL_USE_IPV6 1 +# define OPENSSL_USE_IPV6 0 # else -git diff -Nur -p1 a/OpenSSL_1_1_0e/include/openssl/opensslconf.h b/OpenSSL_1_1_0e/include/openssl/opensslconf.h +diff -Nur -p1 a/OpenSSL_1_1_0e/include/openssl/opensslconf.h b/OpenSSL_1_1_0e/include/openssl/opensslconf.h --- a/OpenSSL_1_1_0e/include/openssl/opensslconf.h 1970-01-01 08:00:00.000000000 +0800 -+++ b/OpenSSL_1_1_0e/include/openssl/opensslconf.h 2021-03-22 11:52:44.449197299 +0800 ++++ b/OpenSSL_1_1_0e/include/openssl/opensslconf.h 2021-06-30 15:48:12.191450027 +0800 @@ -0,0 +1,169 @@ +/* + * WARNING: do not edit! diff --git a/components/security/openssl/patch.sha256 b/components/security/openssl/patch.sha256 index 6b875858de9e717357e3bf913c18dd18ef86e3b5..b2a295f0b578184f3355adabb89f547a8fb197b7 100644 --- a/components/security/openssl/patch.sha256 +++ b/components/security/openssl/patch.sha256 @@ -1 +1 @@ -63264ae39492aae1df59b2817515ff0ab7e6d1a9d4c9893e0c83f2495118c136 origin.patch +f6d21bdc429aea8f76b666227f08c62ae3f64e3e3d2afab7461c44d9a03ad428 origin.patch diff --git a/components/utility/curl/origin.patch b/components/utility/curl/origin.patch index 61e8624627c2e26780f41689f7d77204df05d405..db3f3545acfe15a995dbccf106c8d6afd0ae71e8 100644 --- a/components/utility/curl/origin.patch +++ b/components/utility/curl/origin.patch @@ -1,6 +1,6 @@ -diff --git a/curl-7.54.1/include/curl/curlbuild.h b/curl-7.54.1/include/curl/curlbuild.h +diff -Nur -p1 a/curl-7.54.1/include/curl/curlbuild.h b/curl-7.54.1/include/curl/curlbuild.h --- a/curl-7.54.1/include/curl/curlbuild.h 1970-01-01 08:00:00.000000000 +0800 -+++ b/curl-7.54.1/include/curl/curlbuild.h 2021-03-27 18:29:33.807400312 +0800 ++++ b/curl-7.54.1/include/curl/curlbuild.h 2021-06-29 14:04:36.036099400 +0800 @@ -0,0 +1,198 @@ +/* include/curl/curlbuild.h. Generated from curlbuild.h.in by configure. */ +#ifndef __CURL_CURLBUILD_H @@ -200,9 +200,9 @@ diff --git a/curl-7.54.1/include/curl/curlbuild.h b/curl-7.54.1/include/curl/cur +#define CURL_SUFFIX_CURL_OFF_TU ULL + +#endif /* __CURL_CURLBUILD_H */ -diff --git a/curl-7.54.1/lib/curl_config.h b/curl-7.54.1/lib/curl_config.h +diff -Nur -p1 a/curl-7.54.1/lib/curl_config.h b/curl-7.54.1/lib/curl_config.h --- a/curl-7.54.1/lib/curl_config.h 1970-01-01 08:00:00.000000000 +0800 -+++ b/curl-7.54.1/lib/curl_config.h 2021-03-27 18:30:23.643400553 +0800 ++++ b/curl-7.54.1/lib/curl_config.h 2021-06-29 17:25:09.786338092 +0800 @@ -0,0 +1,1040 @@ +/* lib/curl_config.h. Generated from curl_config.h.in by configure. */ +/* lib/curl_config.h.in. Generated from configure.ac by autoheader. */ @@ -763,7 +763,7 @@ diff --git a/curl-7.54.1/lib/curl_config.h b/curl-7.54.1/lib/curl_config.h +#define HAVE_SGTTY_H 1 + +/* Define to 1 if you have the sigaction function. */ -+#define HAVE_SIGACTION 1 ++/* #define HAVE_SIGACTION 1 */ + +/* Define to 1 if you have the siginterrupt function. */ +#define HAVE_SIGINTERRUPT 1 @@ -1244,9 +1244,9 @@ diff --git a/curl-7.54.1/lib/curl_config.h b/curl-7.54.1/lib/curl_config.h + +/* the signed version of size_t */ +/* #undef ssize_t */ -diff --git a/curl-7.54.1/lib/curl_setup_once.h b/curl-7.54.1/lib/curl_setup_once.h +diff -Nur -p1 a/curl-7.54.1/lib/curl_setup_once.h b/curl-7.54.1/lib/curl_setup_once.h --- a/curl-7.54.1/lib/curl_setup_once.h 2017-06-14 14:08:56.000000000 +0800 -+++ b/curl-7.54.1/lib/curl_setup_once.h 2021-03-29 10:46:07.596101095 +0800 ++++ b/curl-7.54.1/lib/curl_setup_once.h 2021-06-29 14:04:36.036099400 +0800 @@ -416,2 +416,3 @@ typedef int sig_atomic_t; +#ifndef __LITEOS__ diff --git a/components/utility/curl/patch.sha256 b/components/utility/curl/patch.sha256 index 4d60cf60f6728909a7979a26cc7c58f4cee58850..c563ee42e5d72360ce1ed39e066bc6bc5aa2b1c4 100644 --- a/components/utility/curl/patch.sha256 +++ b/components/utility/curl/patch.sha256 @@ -1 +1 @@ -9107c6e3d610cd2a1297be4b0c0df12065e80353f3b9b415a2d52325546af9ca origin.patch +0230ba74844259e060e9d540e0b438169e7aad23c21e7a5abadeedabcbfdac13 origin.patch