From 804fbeace0374ad21d919a29a95cdbc4acd891d4 Mon Sep 17 00:00:00 2001 From: "Vladimir D. Seleznev" Date: Mon, 6 Nov 2017 18:55:44 +0300 Subject: [PATCH] ALT: OPENSSLDIR --- libressl/Makefile.am | 4 ++-- libressl/Makefile.in | 4 ++-- libressl/apps/nc/CMakeLists.txt | 2 +- libressl/apps/nc/nc.1 | 2 +- libressl/apps/ocspcheck/CMakeLists.txt | 2 +- libressl/crypto/CMakeLists.txt | 2 +- libressl/include/arch/aarch64/opensslconf.h | 2 +- libressl/include/arch/alpha/opensslconf.h | 2 +- libressl/include/arch/amd64/opensslconf.h | 2 +- libressl/include/arch/arm/opensslconf.h | 2 +- libressl/include/arch/hppa/opensslconf.h | 2 +- libressl/include/arch/i386/opensslconf.h | 2 +- libressl/include/arch/m88k/opensslconf.h | 2 +- libressl/include/arch/mips/opensslconf.h | 2 +- libressl/include/arch/mips64/opensslconf.h | 2 +- libressl/include/arch/powerpc/opensslconf.h | 2 +- libressl/include/arch/powerpc64/opensslconf.h | 2 +- libressl/include/arch/riscv64/opensslconf.h | 2 +- libressl/include/arch/sh/opensslconf.h | 2 +- libressl/include/arch/sparc64/opensslconf.h | 2 +- libressl/include/openssl/opensslconf.h | 2 +- libressl/tests/ocsp_test.c | 2 +- libressl/tls/CMakeLists.txt | 2 +- libressl/tls/Makefile.am | 2 +- libressl/tls/Makefile.in | 2 +- libressl/tls/tls_internal.h | 2 +- 26 files changed, 28 insertions(+), 28 deletions(-) diff --git a/libressl/Makefile.am b/libressl/Makefile.am index d28692a..98d95f8 100644 --- a/libressl/Makefile.am +++ b/libressl/Makefile.am @@ -21,7 +21,7 @@ install-exec-hook: @if [ "@OPENSSLDIR@x" != "x" ]; then \ OPENSSLDIR="$(DESTDIR)@OPENSSLDIR@"; \ else \ - OPENSSLDIR="$(DESTDIR)$(sysconfdir)/ssl"; \ + OPENSSLDIR="$(DESTDIR)$(sysconfdir)/libressl"; \ fi; \ mkdir -p "$$OPENSSLDIR/certs"; \ for i in cert.pem openssl.cnf x509v3.cnf; do \ @@ -36,7 +36,7 @@ uninstall-local: @if [ "@OPENSSLDIR@x" != "x" ]; then \ OPENSSLDIR="$(DESTDIR)@OPENSSLDIR@"; \ else \ - OPENSSLDIR="$(DESTDIR)$(sysconfdir)/ssl"; \ + OPENSSLDIR="$(DESTDIR)$(sysconfdir)/libressl"; \ fi; \ for i in cert.pem openssl.cnf x509v3.cnf; do \ if cmp -s "$$OPENSSLDIR/$$i" "$(srcdir)/$$i"; then \ diff --git a/libressl/Makefile.in b/libressl/Makefile.in index d12a889..463b17a 100644 --- a/libressl/Makefile.in +++ b/libressl/Makefile.in @@ -893,7 +893,7 @@ install-exec-hook: @if [ "@OPENSSLDIR@x" != "x" ]; then \ OPENSSLDIR="$(DESTDIR)@OPENSSLDIR@"; \ else \ - OPENSSLDIR="$(DESTDIR)$(sysconfdir)/ssl"; \ + OPENSSLDIR="$(DESTDIR)$(sysconfdir)/libressl"; \ fi; \ mkdir -p "$$OPENSSLDIR/certs"; \ for i in cert.pem openssl.cnf x509v3.cnf; do \ @@ -908,7 +908,7 @@ uninstall-local: @if [ "@OPENSSLDIR@x" != "x" ]; then \ OPENSSLDIR="$(DESTDIR)@OPENSSLDIR@"; \ else \ - OPENSSLDIR="$(DESTDIR)$(sysconfdir)/ssl"; \ + OPENSSLDIR="$(DESTDIR)$(sysconfdir)/libressl"; \ fi; \ for i in cert.pem openssl.cnf x509v3.cnf; do \ if cmp -s "$$OPENSSLDIR/$$i" "$(srcdir)/$$i"; then \ diff --git a/libressl/apps/nc/CMakeLists.txt b/libressl/apps/nc/CMakeLists.txt index bd59211..545b311 100644 --- a/libressl/apps/nc/CMakeLists.txt +++ b/libressl/apps/nc/CMakeLists.txt @@ -32,7 +32,7 @@ endif() if(NOT "${OPENSSLDIR}" STREQUAL "") add_definitions(-DDEFAULT_CA_FILE=\"${OPENSSLDIR}/cert.pem\") else() - add_definitions(-DDEFAULT_CA_FILE=\"${CMAKE_INSTALL_PREFIX}/etc/ssl/cert.pem\") + add_definitions(-DDEFAULT_CA_FILE=\"${CMAKE_INSTALL_PREFIX}/etc/libressl/cert.pem\") endif() add_executable(nc ${NC_SRC}) diff --git a/libressl/apps/nc/nc.1 b/libressl/apps/nc/nc.1 index 8f7d154..961e265 100644 --- a/libressl/apps/nc/nc.1 +++ b/libressl/apps/nc/nc.1 @@ -231,7 +231,7 @@ Cannot be used together with Load the root CA bundle for TLS certificate verification from .Ar CAfile , in PEM format, instead of -.Pa /etc/ssl/cert.pem . +.Pa /etc/libressl/cert.pem . Requires .Fl c . .It Fl r diff --git a/libressl/apps/ocspcheck/CMakeLists.txt b/libressl/apps/ocspcheck/CMakeLists.txt index 2dddb6e..44ec649 100644 --- a/libressl/apps/ocspcheck/CMakeLists.txt +++ b/libressl/apps/ocspcheck/CMakeLists.txt @@ -16,7 +16,7 @@ endif() if(NOT "${OPENSSLDIR}" STREQUAL "") add_definitions(-DDEFAULT_CA_FILE=\"${OPENSSLDIR}/cert.pem\") else() - add_definitions(-DDEFAULT_CA_FILE=\"${CMAKE_INSTALL_PREFIX}/etc/ssl/cert.pem\") + add_definitions(-DDEFAULT_CA_FILE=\"${CMAKE_INSTALL_PREFIX}/etc/libressl/cert.pem\") endif() add_executable(ocspcheck ${OCSPCHECK_SRC}) diff --git a/libressl/crypto/CMakeLists.txt b/libressl/crypto/CMakeLists.txt index a364e86..bc0a2fc 100644 --- a/libressl/crypto/CMakeLists.txt +++ b/libressl/crypto/CMakeLists.txt @@ -989,7 +989,7 @@ else() if(WIN32) add_definitions(-DOPENSSLDIR=\"C:/Windows/libressl/ssl\") else() - add_definitions(-DOPENSSLDIR=\"${CMAKE_INSTALL_PREFIX}/etc/ssl\") + add_definitions(-DOPENSSLDIR=\"${CMAKE_INSTALL_PREFIX}/etc/libressl\") endif() endif() diff --git a/libressl/include/arch/aarch64/opensslconf.h b/libressl/include/arch/aarch64/opensslconf.h index 748ed8f..aa23f35 100644 --- a/libressl/include/arch/aarch64/opensslconf.h +++ b/libressl/include/arch/aarch64/opensslconf.h @@ -2,7 +2,7 @@ /* crypto/opensslconf.h.in */ #if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR) -#define OPENSSLDIR "/etc/ssl" +#define OPENSSLDIR "/etc/libressl" #endif #undef OPENSSL_UNISTD diff --git a/libressl/include/arch/alpha/opensslconf.h b/libressl/include/arch/alpha/opensslconf.h index 47f2aa8..8ad9e77 100644 --- a/libressl/include/arch/alpha/opensslconf.h +++ b/libressl/include/arch/alpha/opensslconf.h @@ -2,7 +2,7 @@ /* crypto/opensslconf.h.in */ #if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR) -#define OPENSSLDIR "/etc/ssl" +#define OPENSSLDIR "/etc/libressl" #endif #undef OPENSSL_UNISTD diff --git a/libressl/include/arch/amd64/opensslconf.h b/libressl/include/arch/amd64/opensslconf.h index 5cad089..3f98e5c 100644 --- a/libressl/include/arch/amd64/opensslconf.h +++ b/libressl/include/arch/amd64/opensslconf.h @@ -2,7 +2,7 @@ /* crypto/opensslconf.h.in */ #if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR) -#define OPENSSLDIR "/etc/ssl" +#define OPENSSLDIR "/etc/libressl" #endif #undef OPENSSL_UNISTD diff --git a/libressl/include/arch/arm/opensslconf.h b/libressl/include/arch/arm/opensslconf.h index f17d3d2..9435f31 100644 --- a/libressl/include/arch/arm/opensslconf.h +++ b/libressl/include/arch/arm/opensslconf.h @@ -2,7 +2,7 @@ /* crypto/opensslconf.h.in */ #if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR) -#define OPENSSLDIR "/etc/ssl" +#define OPENSSLDIR "/etc/libressl" #endif #undef OPENSSL_UNISTD diff --git a/libressl/include/arch/hppa/opensslconf.h b/libressl/include/arch/hppa/opensslconf.h index f17d3d2..9435f31 100644 --- a/libressl/include/arch/hppa/opensslconf.h +++ b/libressl/include/arch/hppa/opensslconf.h @@ -2,7 +2,7 @@ /* crypto/opensslconf.h.in */ #if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR) -#define OPENSSLDIR "/etc/ssl" +#define OPENSSLDIR "/etc/libressl" #endif #undef OPENSSL_UNISTD diff --git a/libressl/include/arch/i386/opensslconf.h b/libressl/include/arch/i386/opensslconf.h index 3b3827c..04a70f4 100644 --- a/libressl/include/arch/i386/opensslconf.h +++ b/libressl/include/arch/i386/opensslconf.h @@ -2,7 +2,7 @@ /* crypto/opensslconf.h.in */ #if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR) -#define OPENSSLDIR "/etc/ssl" +#define OPENSSLDIR "/etc/libressl" #endif #undef OPENSSL_UNISTD diff --git a/libressl/include/arch/m88k/opensslconf.h b/libressl/include/arch/m88k/opensslconf.h index f17d3d2..9435f31 100644 --- a/libressl/include/arch/m88k/opensslconf.h +++ b/libressl/include/arch/m88k/opensslconf.h @@ -2,7 +2,7 @@ /* crypto/opensslconf.h.in */ #if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR) -#define OPENSSLDIR "/etc/ssl" +#define OPENSSLDIR "/etc/libressl" #endif #undef OPENSSL_UNISTD diff --git a/libressl/include/arch/mips/opensslconf.h b/libressl/include/arch/mips/opensslconf.h index f17d3d2..9435f31 100644 --- a/libressl/include/arch/mips/opensslconf.h +++ b/libressl/include/arch/mips/opensslconf.h @@ -2,7 +2,7 @@ /* crypto/opensslconf.h.in */ #if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR) -#define OPENSSLDIR "/etc/ssl" +#define OPENSSLDIR "/etc/libressl" #endif #undef OPENSSL_UNISTD diff --git a/libressl/include/arch/mips64/opensslconf.h b/libressl/include/arch/mips64/opensslconf.h index ed1204c..5de7d31 100644 --- a/libressl/include/arch/mips64/opensslconf.h +++ b/libressl/include/arch/mips64/opensslconf.h @@ -2,7 +2,7 @@ /* crypto/opensslconf.h.in */ #if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR) -#define OPENSSLDIR "/etc/ssl" +#define OPENSSLDIR "/etc/libressl" #endif #undef OPENSSL_UNISTD diff --git a/libressl/include/arch/powerpc/opensslconf.h b/libressl/include/arch/powerpc/opensslconf.h index f17d3d2..9435f31 100644 --- a/libressl/include/arch/powerpc/opensslconf.h +++ b/libressl/include/arch/powerpc/opensslconf.h @@ -2,7 +2,7 @@ /* crypto/opensslconf.h.in */ #if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR) -#define OPENSSLDIR "/etc/ssl" +#define OPENSSLDIR "/etc/libressl" #endif #undef OPENSSL_UNISTD diff --git a/libressl/include/arch/powerpc64/opensslconf.h b/libressl/include/arch/powerpc64/opensslconf.h index 5cad089..3f98e5c 100644 --- a/libressl/include/arch/powerpc64/opensslconf.h +++ b/libressl/include/arch/powerpc64/opensslconf.h @@ -2,7 +2,7 @@ /* crypto/opensslconf.h.in */ #if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR) -#define OPENSSLDIR "/etc/ssl" +#define OPENSSLDIR "/etc/libressl" #endif #undef OPENSSL_UNISTD diff --git a/libressl/include/arch/riscv64/opensslconf.h b/libressl/include/arch/riscv64/opensslconf.h index 748ed8f..aa23f35 100644 --- a/libressl/include/arch/riscv64/opensslconf.h +++ b/libressl/include/arch/riscv64/opensslconf.h @@ -2,7 +2,7 @@ /* crypto/opensslconf.h.in */ #if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR) -#define OPENSSLDIR "/etc/ssl" +#define OPENSSLDIR "/etc/libressl" #endif #undef OPENSSL_UNISTD diff --git a/libressl/include/arch/sh/opensslconf.h b/libressl/include/arch/sh/opensslconf.h index f17d3d2..9435f31 100644 --- a/libressl/include/arch/sh/opensslconf.h +++ b/libressl/include/arch/sh/opensslconf.h @@ -2,7 +2,7 @@ /* crypto/opensslconf.h.in */ #if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR) -#define OPENSSLDIR "/etc/ssl" +#define OPENSSLDIR "/etc/libressl" #endif #undef OPENSSL_UNISTD diff --git a/libressl/include/arch/sparc64/opensslconf.h b/libressl/include/arch/sparc64/opensslconf.h index ed1204c..5de7d31 100644 --- a/libressl/include/arch/sparc64/opensslconf.h +++ b/libressl/include/arch/sparc64/opensslconf.h @@ -2,7 +2,7 @@ /* crypto/opensslconf.h.in */ #if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR) -#define OPENSSLDIR "/etc/ssl" +#define OPENSSLDIR "/etc/libressl" #endif #undef OPENSSL_UNISTD diff --git a/libressl/include/openssl/opensslconf.h b/libressl/include/openssl/opensslconf.h index 5cad089..3f98e5c 100644 --- a/libressl/include/openssl/opensslconf.h +++ b/libressl/include/openssl/opensslconf.h @@ -2,7 +2,7 @@ /* crypto/opensslconf.h.in */ #if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR) -#define OPENSSLDIR "/etc/ssl" +#define OPENSSLDIR "/etc/libressl" #endif #undef OPENSSL_UNISTD diff --git a/libressl/tests/ocsp_test.c b/libressl/tests/ocsp_test.c index 94ef73e..7a3b45d 100644 --- a/libressl/tests/ocsp_test.c +++ b/libressl/tests/ocsp_test.c @@ -76,7 +76,7 @@ main(int argc, char *argv[]) #ifdef _PATH_SSL_CA_FILE char *cafile = _PATH_SSL_CA_FILE; #else - char *cafile = "/etc/ssl/cert.pem"; + char *cafile = "/etc/libressl/cert.pem"; #endif SSL *ssl; diff --git a/libressl/tls/CMakeLists.txt b/libressl/tls/CMakeLists.txt index 62dde63..03cd0b8 100644 --- a/libressl/tls/CMakeLists.txt +++ b/libressl/tls/CMakeLists.txt @@ -27,7 +27,7 @@ endif() if(NOT "${OPENSSLDIR}" STREQUAL "") add_definitions(-DTLS_DEFAULT_CA_FILE=\"${OPENSSLDIR}/cert.pem\") else() - add_definitions(-DTLS_DEFAULT_CA_FILE=\"${CMAKE_INSTALL_PREFIX}/etc/ssl/cert.pem\") + add_definitions(-DTLS_DEFAULT_CA_FILE=\"${CMAKE_INSTALL_PREFIX}/etc/libressl/cert.pem\") endif() file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/tls.sym DESTINATION diff --git a/libressl/tls/Makefile.am b/libressl/tls/Makefile.am index 9b62b22..03fef6b 100644 --- a/libressl/tls/Makefile.am +++ b/libressl/tls/Makefile.am @@ -30,7 +30,7 @@ libtls_la_CPPFLAGS = $(AM_CPPFLAGS) if OPENSSLDIR_DEFINED libtls_la_CPPFLAGS += -DTLS_DEFAULT_CA_FILE=\"@OPENSSLDIR@/cert.pem\" else -libtls_la_CPPFLAGS += -DTLS_DEFAULT_CA_FILE=\"$(sysconfdir)/ssl/cert.pem\" +libtls_la_CPPFLAGS += -DTLS_DEFAULT_CA_FILE=\"$(sysconfdir)/libressl/cert.pem\" endif libtls_la_SOURCES = tls.c diff --git a/libressl/tls/Makefile.in b/libressl/tls/Makefile.in index 122c4ff..7f4ee76 100644 --- a/libressl/tls/Makefile.in +++ b/libressl/tls/Makefile.in @@ -90,7 +90,7 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ @OPENSSLDIR_DEFINED_TRUE@am__append_1 = -DTLS_DEFAULT_CA_FILE=\"@OPENSSLDIR@/cert.pem\" -@OPENSSLDIR_DEFINED_FALSE@am__append_2 = -DTLS_DEFAULT_CA_FILE=\"$(sysconfdir)/ssl/cert.pem\" +@OPENSSLDIR_DEFINED_FALSE@am__append_2 = -DTLS_DEFAULT_CA_FILE=\"$(sysconfdir)/libressl/cert.pem\" @HOST_WIN_TRUE@am__append_3 = compat/ftruncate.c compat/pread.c \ @HOST_WIN_TRUE@ compat/pwrite.c subdir = tls diff --git a/libressl/tls/tls_internal.h b/libressl/tls/tls_internal.h index ca1d96f..8a9f23b 100644 --- a/libressl/tls/tls_internal.h +++ b/libressl/tls/tls_internal.h @@ -29,7 +29,7 @@ __BEGIN_HIDDEN_DECLS #ifndef TLS_DEFAULT_CA_FILE -#define TLS_DEFAULT_CA_FILE "/etc/ssl/cert.pem" +#define TLS_DEFAULT_CA_FILE "/etc/libressl/cert.pem" #endif #define TLS_CIPHERS_DEFAULT "TLSv1.3:TLSv1.2+AEAD+ECDHE:TLSv1.2+AEAD+DHE" -- 2.33.7