On Fri, Jan 29, 2021 at 01:57:02PM +0100, Daniel Gustafsson wrote: > This has been discussed elsewhere in the thread, so let's continue that there. > The attached v23 does however split off --with-ssl for OpenSSL in 0001, adding > the nss option in 0002.
While going through 0001, I have found a couple of things.
-CF_SRCS = $(if $(subst no,,$(with_openssl)), $(OSSL_SRCS), $(INT_SRCS))
-CF_TESTS = $(if $(subst no,,$(with_openssl)), $(OSSL_TESTS), $(INT_TESTS))
+CF_SRCS = $(if $(subst openssl,,$(with_ssl)), $(OSSL_SRCS), $(INT_SRCS))
+CF_TESTS = $(if $(subst openssl,,$(with_ssl)), $(OSSL_TESTS), $(INT_TESTS))
It seems to me that this part is the opposite, aka here the OpenSSL
files and tests (OSSL*) would be used if with_ssl is not openssl.
-ifeq ($(with_openssl),yes)
+ifneq ($(with_ssl),no)
+OBJS += \
+ fe-secure-common.o
+endif
This split is better, good idea.
The two SSL tests still included a reference to with_openssl after
0001:
src/test/ssl/t/001_ssltests.pl:if ($ENV{with_openssl} eq 'yes')
src/test/ssl/t/002_scram.pl:if ($ENV{with_openssl} ne 'yes')
I have refreshed the docs on top to be consistent with the new
configuration, and applied it after more checks. I'll try to look in
more details at the failures with cryptohashes I found upthread.
--
Michael
signature.asc
Description: PGP signature
