summaryrefslogtreecommitdiff
path: root/Configurations
Commit message (Collapse)AuthorAgeFilesLines
* Add LoongArch64 cpuid and OPENSSL_loongarchcap_Pzhuchen2022-10-121-0/+1
| | | | | | | | | | | | | Loongarch64 architecture defines 128 bit vector extension lsx and 256 bit vector extension lasx. The cpucfg instruction can be used to obtain whether the CPU has a corresponding extension. This part of code is added to prepare for the subsequent addition of corresponding vector instruction optimization. Signed-off-by: zhuchen <zhuchen@loongson.cn> Reviewed-by: Tomas Mraz <tomas@openssl.org> Reviewed-by: Paul Dale <pauli@openssl.org> (Merged from https://github.com/openssl/openssl/pull/19364)
* apps & al : Fix various typos, repeated words, align some spelling to LDP.FdaSilvaYY2022-10-121-5/+5
| | | | | | | | | | | | Mostly revamped from #16712 - fall thru -> fall through - time stamp -> timestamp - host name -> hostname - ipv6 -> IPv6 Reviewed-by: Tomas Mraz <tomas@openssl.org> Reviewed-by: Paul Dale <pauli@openssl.org> (Merged from https://github.com/openssl/openssl/pull/19059)
* VMS: For executables, process the use of /INCLUDE=main a bit differentlyRichard Levitte2022-10-061-8/+11
| | | | | | | | | The way it was implemented didn't play well with perl's join(), so it's reimplemented a bit differently. Reviewed-by: Tim Hudson <tjh@openssl.org> Reviewed-by: Tomas Mraz <tomas@openssl.org> (Merged from https://github.com/openssl/openssl/pull/19347)
* VMS: use selective search when linking with shareable imagesRichard Levitte2022-10-041-31/+42
| | | | | | | | | | | | | | | | | | | | | | | | VMS linking complains a lot about multiply defined symbols unless told otherwise, especially when shareable images are involved. For example, this involves the legacy provider, where there are overriding implementations of certain ERR functions. To quiet the linker down, we need to say that symbols should be searched selectively in shareable images. However, that's not quite enough. The order in which the VMS linker processes files isn't necessarily top to bottom as given on the command line or the option file(s), which may result in some symbols appearing undefined, even though they are. To remedy that, it's necessary to explicitly include all object files and object libraries into a cluster, thus ensuring that they will be processed first. This allows the search for remaining symbol references to be done in the as desired in the shareable images that follow. Reviewed-by: Tomas Mraz <tomas@openssl.org> Reviewed-by: Matt Caswell <matt@openssl.org> Reviewed-by: Tim Hudson <tjh@openssl.org> Reviewed-by: Hugo Landau <hlandau@openssl.org> (Merged from https://github.com/openssl/openssl/pull/19327)
* Configurations: mips64*-linux-*abin32 needs bn_ops SIXTY_FOUR_BITAdam Joseph2022-10-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The IRIX mips64-cpu, n32-abi configurations include SIXTY_FOUR_BIT in bn_ops, but it is missing from mips64*-linux-*abin32 (which OpenSSL calls "linux-mips64"). This causes heap corruption when verifying TLS certificates (which tend to be RSA-signed) with openssl 1.1.1q: ``` nix@oak:~$ /nix/store/4k04dh6a1zs6hxiacwcg4a4nvxvgli2j-openssl-mips64el-unknown-linux-gnuabin32-1.1.1q-bin/bin/openssl s_client -host www.google.com -port 443free(): invalid pointer Aborted ``` and a slightly different failure with current HEAD: ``` nix@oak:~$ /nix/store/9bqxharxajsl9fid0c8ls6fb9wxp8kdc-openssl-mips64el-unknown-linux-gnuabin32-1.1.1q-bin/bin/openssl s_client -host www.google.com -port 443 Connecting to 142.250.180.4 CONNECTED(00000003) Fatal glibc error: malloc assertion failure in sysmalloc: (old_top == initial_top (av) && old_size == 0) || ((unsigned long) (old_size) >= MINSIZE && prev_inuse (old_top) && ((unsigned long) old_end & (pagesize - 1)) == 0) Aborted ``` Applying this patch and recompiling produces the expected output instead of a crash. Note that Gentoo (and to my knowledge all other other distributions which support mips64n32) use the `linux-generic32` configuration, which uses only 32-bit arithmetic (rather than full 64-bit arithmetic) and lacks assembler implementations for the SHA hash functions: https://gitweb.gentoo.org/repo/gentoo.git/tree/dev-libs/openssl/files/gentoo.config-1.0.2#n102 For support in nixpkgs we would like to use the full 64-bit integer registers and perlasm routines, so I'm submitting this upstream as well. Fixes #19319 CLA: trivial Reviewed-by: Tomas Mraz <tomas@openssl.org> Reviewed-by: Bernd Edlinger <bernd.edlinger@hotmail.de> Reviewed-by: Paul Dale <pauli@openssl.org> (Merged from https://github.com/openssl/openssl/pull/19320)
* Makefile: Add check-format target, operating on all .c sources and ↵Dr. David von Oheimb2022-09-301-0/+5
| | | | | | | | | crypto+ssl headers Reviewed-by: Paul Dale <pauli@openssl.org> Reviewed-by: Tomas Mraz <tomas@openssl.org> Reviewed-by: David von Oheimb <david.von.oheimb@siemens.com> (Merged from https://github.com/openssl/openssl/pull/15913)
* Makefile: Exclude dummy header asn1_mac.h from CRYPTOHEADERSDr. David von Oheimb2022-09-301-1/+2
| | | | | | | Reviewed-by: Paul Dale <pauli@openssl.org> Reviewed-by: Tomas Mraz <tomas@openssl.org> Reviewed-by: David von Oheimb <david.von.oheimb@siemens.com> (Merged from https://github.com/openssl/openssl/pull/15913)
* Makefile: Update but disable 'lint' target, using splint with some quirksDr. David von Oheimb2022-09-301-1/+4
| | | | | | | Reviewed-by: Paul Dale <pauli@openssl.org> Reviewed-by: Tomas Mraz <tomas@openssl.org> Reviewed-by: David von Oheimb <david.von.oheimb@siemens.com> (Merged from https://github.com/openssl/openssl/pull/15913)
* Makefile: Add SRCS list of all .c (and any .cc and .cpp) filesDr. David von Oheimb2022-09-301-0/+8
| | | | | | | Reviewed-by: Paul Dale <pauli@openssl.org> Reviewed-by: Tomas Mraz <tomas@openssl.org> Reviewed-by: David von Oheimb <david.von.oheimb@siemens.com> (Merged from https://github.com/openssl/openssl/pull/15913)
* djgpp: Inherit config from BASE_unixJ.W. Jagersma2022-09-291-0/+1
| | | | | | | | | | | | | Build failed on djgpp due to missing config vars 'AR' and 'ARFLAGS'. Additionally, '-lz' was not added to 'lflags' when zlib support was enabled. Inheriting configuration variables from BASE_unix solves both these issues. CLA: trivial Reviewed-by: Richard Levitte <levitte@openssl.org> Reviewed-by: Tomas Mraz <tomas@openssl.org> (Merged from https://github.com/openssl/openssl/pull/19274)
* Configurations/descrip.mms.tmpl: Add another inclusion hackRichard Levitte2022-09-281-0/+16
| | | | | | | | | More adaptations are needed for sources in ssl/, which all include `ssl/ssl_local.h`. Reviewed-by: Paul Dale <pauli@openssl.org> Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com> (Merged from https://github.com/openssl/openssl/pull/19276)
* Revert (most of) "Makefile: Generate crypto objects only as far as needed"Dr. David von Oheimb2022-09-131-33/+13
| | | | | | | | | | | | This reverts all adaptations by commit 89c39bd8f6528ad268c1c0d0c9e196ba4396941b on Configurations/unix-Makefile.tmpl except for additions to .PHONY Fixes #19087 Reviewed-by: Richard Levitte <levitte@openssl.org> Reviewed-by: Tomas Mraz <tomas@openssl.org> Reviewed-by: David von Oheimb <david.von.oheimb@siemens.com> (Merged from https://github.com/openssl/openssl/pull/19179)
* Add linux32-riscv32/BSD-riscv32 targetHongren (Zenithal) Zheng2022-09-051-2/+14
| | | | | | Reviewed-by: Tomas Mraz <tomas@openssl.org> Reviewed-by: Paul Dale <pauli@openssl.org> (Merged from https://github.com/openssl/openssl/pull/18308)
* Makefile: Generate crypto objects only as far as neededDr. David von Oheimb2022-08-231-10/+33
| | | | | | | Reviewed-by: Richard Levitte <levitte@openssl.org> Reviewed-by: Tomas Mraz <tomas@openssl.org> Reviewed-by: David von Oheimb <david.von.oheimb@siemens.com> (Merged from https://github.com/openssl/openssl/pull/15224)
* Makefile: Call mknum.pl on 'make ordinals' only if neededDr. David von Oheimb2022-08-231-1/+4
| | | | | | | Reviewed-by: Richard Levitte <levitte@openssl.org> Reviewed-by: Tomas Mraz <tomas@openssl.org> Reviewed-by: David von Oheimb <david.von.oheimb@siemens.com> (Merged from https://github.com/openssl/openssl/pull/15224)
* Add BSD-armv4 target based on linux-armv4Piotr Kubaj2022-08-221-0/+37
| | | | | | | | Reviewed-by: Matt Caswell <matt@openssl.org> Reviewed-by: Hugo Landau <hlandau@openssl.org> Reviewed-by: Todd Short <todd.short@me.com> Reviewed-by: Tomas Mraz <tomas@openssl.org> (Merged from https://github.com/openssl/openssl/pull/18910)
* Fix quotes install_fips in Configurations/windows-makefile.tmplRichard Levitte2022-07-281-2/+2
| | | | | | | | | | | | Directories and file names with spaces require quoting... again Fixes #18880 Reviewed-by: Tomas Mraz <tomas@openssl.org> Reviewed-by: Matt Caswell <matt@openssl.org> Reviewed-by: Paul Dale <pauli@openssl.org> Reviewed-by: Hugo Landau <hlandau@openssl.org> (Merged from https://github.com/openssl/openssl/pull/18881)
* Configurations/10-main.conf: In the VC-common target, unquote $(CC)Richard Levitte2022-07-261-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | Some of the VC-common attributes have values that use `$(CC)`, wrapped with quotes. However, `Configurations/windows-makefile.tmpl` already quotes the `CC` value, like this: CC="{- $config{CC} -}" The interaction between that makefile variable and the attributes using `$(CC)` wrapped with quotes is a command line with the quotes doubled. For example, the value of `$(CPP)` becomes `""cl""`. Strangely enough, this appears to be tolerated, at least on some versions of Windows. However, this has been reported not to be the case. This is fixed by removing the quotes in `Configurations/10-main.conf`, making `Configurations/windows-makefile.tmpl` responsible for proper quoting. Fixes #18823 Reviewed-by: Hugo Landau <hlandau@openssl.org> Reviewed-by: Matt Caswell <matt@openssl.org> (Merged from https://github.com/openssl/openssl/pull/18861) (cherry picked from commit c04b8819161de007cee831dd9e58dde52268da18)
* Windows: use the basename of the product (.dll) for definition filesRichard Levitte2022-07-081-1/+1
| | | | | | | | | | | | This resolves the faulty LIBRARY value that contained the directory of the product (.dll) in the build tree. This applies to engines and other modules alike. Fixes #18726 Reviewed-by: Hugo Landau <hlandau@openssl.org> Reviewed-by: Shane Lontis <shane.lontis@oracle.com> (Merged from https://github.com/openssl/openssl/pull/18732)
* Remove debug and other outdated build targets.Daniel Fiala2022-06-161-94/+0
| | | | | | | Reviewed-by: Richard Levitte <levitte@openssl.org> Reviewed-by: Paul Dale <pauli@openssl.org> Reviewed-by: Tomas Mraz <tomas@openssl.org> (Merged from https://github.com/openssl/openssl/pull/18571)
* Add OSSL_QUIC methods to headers and manual pagesTomas Mraz2022-06-031-0/+1
| | | | | | Reviewed-by: Matt Caswell <matt@openssl.org> Reviewed-by: Paul Dale <pauli@openssl.org> (Merged from https://github.com/openssl/openssl/pull/18307)
* Configurations/gentemplate.pm: Generate generators too, when necessaryRichard Levitte2022-05-271-0/+4
| | | | | | | | | | | | A generator in a `GENERATE[generated]=generator` build.info statement may itself be generated. That needs to be taken into account. This was always meant to be, but we missed the spot, for lack of use cases. Now we have one. Reviewed-by: Matt Caswell <matt@openssl.org> Reviewed-by: Tomas Mraz <tomas@openssl.org> (Merged from https://github.com/openssl/openssl/pull/18263)
* Remove include/openssl/configuration.h from mandatory dependenciesRichard Levitte2022-05-253-0/+3
| | | | | | | | | | | | | | | | | Since this file is generated by configdata.pm, there's no need to include it among the mandatory dependencies (which end up in the `GENERATE_MANDATORY` Makefile variable). In fact, it shouldn't be there any more, as that would also cause it to be removed by `make clean`. To compensate, we add an explicit removal of that file in the `distclean` target on all platform families. Fixes #18396 Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com> Reviewed-by: Paul Dale <pauli@openssl.org> Reviewed-by: Tomas Mraz <tomas@openssl.org> (Merged from https://github.com/openssl/openssl/pull/18398)
* Add riscv64 asm_arch to BSD-riscv64 targetHongren (Zenithal) Zheng2022-05-251-0/+1
| | | | | | | | | | Following cb2764f2a8 Add riscv64 asm_arch to linux64-riscv64 target Current ASM does not have Linux specific thing thus this is suitable for BSD Reviewed-by: Todd Short <todd.short@me.com> Reviewed-by: Paul Dale <pauli@openssl.org> (Merged from https://github.com/openssl/openssl/pull/18309)
* Building: For the FIPS module checksum, keep track of configuration,hRichard Levitte2022-05-221-2/+5
| | | | | | | | | | | | The FIPS module checksum needs to know that configuration.h is generated from configuration.h.in, so that information is conserved. To make this possible, it's now possible to have attributes with the GENERATE keyword, and the attribute "skip" is added to make a keyword a no-op, which makes it informative only. Reviewed-by: Tomas Mraz <tomas@openssl.org> Reviewed-by: Todd Short <todd.short@me.com> (Merged from https://github.com/openssl/openssl/pull/16378)
* Prepare NonStop for fixed-size integer types.Randall S. Becker2022-05-191-4/+2
| | | | | | | | | | | | | | | This commit removes platform defines the interfere with loading and resolution of platform and memory model variants of integer types and includes the appropriate files, stdint.h and sys/types.h where the types are defined. Fixes #17669 Signed-off-by: Randall S. Becker <rsbecker@nexbridge.com> Reviewed-by: Matt Caswell <matt@openssl.org> Reviewed-by: Richard Levitte <levitte@openssl.org> Reviewed-by: Paul Dale <pauli@openssl.org> (Merged from https://github.com/openssl/openssl/pull/18325)
* mkdef.pl: Add cmd-line flag to differentiate shared libs and DSO.Daniel Fiala2022-05-133-3/+3
| | | | | | | | Fixes openssl#16984. Reviewed-by: Richard Levitte <levitte@openssl.org> Reviewed-by: Tomas Mraz <tomas@openssl.org> (Merged from https://github.com/openssl/openssl/pull/18284)
* Add quotes around perl scriptsKeith W. Campbell2022-05-111-4/+4
| | | | | | | | | | | Otherwise, it seems nmake doesn't invoke perl properly. Signed-off-by: Keith W. Campbell <keithc@ca.ibm.com> Reviewed-by: Matt Caswell <matt@openssl.org> Reviewed-by: Richard Levitte <levitte@openssl.org> Reviewed-by: Tomas Mraz <tomas@openssl.org> (Merged from https://github.com/openssl/openssl/pull/18215)
* Add riscv64 asm_arch to linux64-riscv64 targetHenry Brausen2022-05-111-0/+1
| | | | | | | | | Reviewed-by: Philipp Tomsich <philipp.tomsich@vrull.eu> Signed-off-by: Henry Brausen <henry.brausen@vrull.eu> Reviewed-by: Tomas Mraz <tomas@openssl.org> Reviewed-by: Paul Dale <pauli@openssl.org> (Merged from https://github.com/openssl/openssl/pull/18275)
* Add -static-libgcc to solaris-sparcv7-gcc shared_ldflagTodd C. Miller2022-04-051-1/+1
| | | | | | | | | | | | This avoids a run-time dependency on libgcc_s.so which may not be present on all systems. OpenSSL already uses -static-libgcc for the solaris-x86-gcc and solaris64-x86_64-gcc configurations. CLA: trivial Reviewed-by: Paul Dale <pauli@openssl.org> Reviewed-by: Tomas Mraz <tomas@openssl.org> (Merged from https://github.com/openssl/openssl/pull/14538)
* Fix AIX build when no-shared is passed to Configure.Todd C. Miller2022-04-051-1/+1
| | | | | | | | | | | | | | AIX shared libs are also .a files so the AIX platform staticname() appends a '_a' to the name to avoid a collision. However, this must not be done when no-shared is passed to Configure or the binaries that link with -lcrypto and -lssl be unable to link as those libraries won't exist without the '_a' suffix. CLA: trivial Reviewed-by: Richard Levitte <levitte@openssl.org> Reviewed-by: Tomas Mraz <tomas@openssl.org> (Merged from https://github.com/openssl/openssl/pull/18006)
* Add loongarch64 targetShi Pujin2022-04-041-0/+7
| | | | | | Reviewed-by: Todd Short <todd.short@me.com> Reviewed-by: Paul Dale <pauli@openssl.org> (Merged from https://github.com/openssl/openssl/pull/17712)
* android-x86 target: Add -latomicMarcel Raad2022-03-091-0/+1
| | | | | | | | | | | Fixes https://github.com/openssl/openssl/issues/14083 again after being broken by https://github.com/openssl/openssl/pull/15640. CLA: trivial Reviewed-by: Paul Dale <pauli@openssl.org> Reviewed-by: Tomas Mraz <tomas@openssl.org> (Merged from https://github.com/openssl/openssl/pull/17833)
* Rework dependencies between config files and build filesRichard Levitte2022-03-043-10/+41
| | | | | | | | | | | | | | | | | | | Before PR #15310, which reworked how build files (Makefile, ...) were generated, everything was done when configuring, so configdata.pm could depend on build file templates and we'd get away with it. However, since building configdata.pm is now independent of the build file templates, that dependency is unnecessary, and would lead to surprises of the build file template is updated, with an unexpected full reconfiguration as a result, when all that's needed is to run configdata.pm with no flags to get the build file re-generated. This change is therefore a completion of what was forgotten in #15310. Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com> Reviewed-by: Tomas Mraz <tomas@openssl.org> Reviewed-by: Paul Dale <pauli@openssl.org> (Merged from https://github.com/openssl/openssl/pull/17756)
* VMS: copy prologue/epilogue headers when header files are generatedRichard Levitte2022-02-251-1/+60
| | | | | | | | | | | | | This is crucial when the build tree isn't the source tree, as they only take effect in directories where included header files reside. The issue only comes up when linking with the static libraries, since the shared libraries have upper case aliases of all symbols. Reviewed-by: Tim Hudson <tjh@openssl.org> Reviewed-by: Paul Dale <pauli@openssl.org> Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com> (Merged from https://github.com/openssl/openssl/pull/17755)
* Fix copyrightsTodd Short2022-02-031-1/+1
| | | | | | | | | Add copyright to files that were missing it. Update license from OpenSSL to Apache as needed. Reviewed-by: Matt Caswell <matt@openssl.org> Reviewed-by: Tomas Mraz <tomas@openssl.org> (Merged from https://github.com/openssl/openssl/pull/17606)
* Include the modules directory in openssl.pcRichard Levitte2022-01-281-0/+1
| | | | | | | | | | Affected file: Configurations/unix-Makefile.tmpl Fixes #17602 Reviewed-by: Matt Caswell <matt@openssl.org> Reviewed-by: Tomas Mraz <tomas@openssl.org> (Merged from https://github.com/openssl/openssl/pull/17605)
* `make clean` should clean up fips provider shared object.Todd Short2022-01-241-1/+1
| | | | | | | | | Reviewed-by: Matt Caswell <matt@openssl.org> Reviewed-by: Richard Levitte <levitte@openssl.org> Reviewed-by: Paul Dale <pauli@openssl.org> (Merged from https://github.com/openssl/openssl/pull/17556) (cherry picked from commit 45036df45048c6498efa49d3572869830d05df45)
* Add support for BSD-riscv64 targetPiotr Kubaj2021-12-221-0/+7
| | | | | | | Reviewed-by: Tomas Mraz <tomas@openssl.org> Reviewed-by: Ben Kaduk <kaduk@mit.edu> Reviewed-by: Paul Dale <pauli@openssl.org> (Merged from https://github.com/openssl/openssl/pull/17306)
* Fix VMS installation - Override the openssl logical name in descrip.mms.tmplRichard Levitte2021-12-141-3/+8
| | | | | | | | | | | This was part of 0cbb6f6a9ac5aa3ff813ef2e5afe6e443708ee20, but was incomplete in that commit. Reviewed-by: Tomas Mraz <tomas@openssl.org> Reviewed-by: Matt Caswell <matt@openssl.org> (Merged from https://github.com/openssl/openssl/pull/16842) (cherry picked from commit 71a78784e8f000703267276b2f87d055bfa0e00e)
* Fix VMS installation - Define the logical name OSSL$MODULESRichard Levitte2021-12-141-6/+6
| | | | | | | | | | | Also, the modules installation directory is version agnostic on other platforms, there's no real reason why it shouldn't be on VMS. Reviewed-by: Tomas Mraz <tomas@openssl.org> Reviewed-by: Matt Caswell <matt@openssl.org> (Merged from https://github.com/openssl/openssl/pull/16842) (cherry picked from commit a4f1e23e6cffdf2ef1aadf96572c251e07869787)
* Fix VMS installation - consistent program names with version infoRichard Levitte2021-12-141-1/+1
| | | | | | | | | | | | | The program name version info is supposed to be the major release version number. This was forgotten when the versioning scheme was changed for 3.0, so the minor release version number slipped in as well. Reviewed-by: Tomas Mraz <tomas@openssl.org> Reviewed-by: Matt Caswell <matt@openssl.org> (Merged from https://github.com/openssl/openssl/pull/16842) (cherry picked from commit 3c9293b4715229dc7ea2116d22c623c2a92ac69a)
* Add support for BSD-ppc, BSD-ppc64 and BSD-ppc64le configurationspkubaj2021-12-091-0/+25
| | | | | | | | | | | OpenSSL assumes AT_HWCAP = 16 (as on Linux), but on FreeBSD AT_HWCAP = 25 Switch to using AT_HWCAP, and setting it to 16 if it is not defined. CLA: trivial Reviewed-by: Matt Caswell <matt@openssl.org> Reviewed-by: Paul Dale <pauli@openssl.org> (Merged from https://github.com/openssl/openssl/pull/17090)
* Detect arm64-*-*bsd and enable assembly optimizationsAllan Jude2021-11-261-0/+8
| | | | | | Reviewed-by: Tomas Mraz <tomas@openssl.org> Reviewed-by: Paul Dale <pauli@openssl.org> (Merged from https://github.com/openssl/openssl/pull/17084)
* Don't delete the doc/html directories when cleaningMatt Caswell2021-11-261-4/+4
| | | | | | | | | | | | | | | | | The doc/html sub-dirs get created by Configure. Therefore they should not be cleaned away by "nmake clean". Otherwise the following sequence fails: perl Configure VC-WIN64A nmake clean nmake nmake install Fixes #17114 Reviewed-by: Tomas Mraz <tomas@openssl.org> Reviewed-by: Paul Dale <pauli@openssl.org> (Merged from https://github.com/openssl/openssl/pull/17128)
* Configurations/windows-makefile.tmpl: obj2bin(): use the resource file tooRichard Levitte2021-10-271-0/+1
| | | | | | | | | | | | When remaking how programs were linked, the variable `$ress` was forgotten. Unfortunately, perl treats this with silence. Fixes #16870 Fixes #16667 Reviewed-by: Tomas Mraz <tomas@openssl.org> Reviewed-by: Tim Hudson <tjh@openssl.org> (Merged from https://github.com/openssl/openssl/pull/16875)
* Update 15-ios.confDominic Letz2021-09-241-1/+1
| | | | | | | | | | | | | CLA: trivial I assume this has been an error in the initial ios conf file. In order to build for ios the shared engine library, needs to be disabled because iOS doesn't have the concept of shared libraries. But instead of only disabling `dynamic-engine` (or like in this commit disabled the `shared`) option the previous config did disable `engine` and with that the `static-engine` compilation as well. This restores the `static-engine` option being enabled by default, but keeping compilation going on iOS. Cheers! Reviewed-by: Paul Dale <pauli@openssl.org> Reviewed-by: Tomas Mraz <tomas@openssl.org> Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com> (Merged from https://github.com/openssl/openssl/pull/16659)
* Configurations/platform/Unix.pm: account for variants in sharedlib_simple()Richard Levitte2021-09-181-3/+15
| | | | | | | | | | | OpenSSL 1.1.1 links the simple libcrypto.so to libcrypto_variant.so, this was inadvertently dropped. Fixes #16605 Reviewed-by: Tomas Mraz <tomas@openssl.org> Reviewed-by: Paul Dale <pauli@openssl.org> (Merged from https://github.com/openssl/openssl/pull/16608)
* Fix the build file templates where uplink mattersRichard Levitte2021-09-132-6/+6
| | | | | | | | | | | | We changed the manner in which a build needing applink is detected, but forgot to change the installation targets accordingly. Fixes #16570 Reviewed-by: Paul Dale <pauli@openssl.org> (Merged from https://github.com/openssl/openssl/pull/16577) (cherry picked from commit de36ce47bf9858f3c517345f46e52d5a6fc506de)
* linux-x86-clang target: Add -latomicTomas Mraz2021-09-131-0/+1
| | | | | | | Fixes #16572 Reviewed-by: Paul Dale <pauli@openssl.org> (Merged from https://github.com/openssl/openssl/pull/16578)
View Lorry Controller Status