From: Amos Jeffries Date: Thu, 28 Jan 2016 16:49:12 +0000 (+1300) Subject: Rename ./certv to ./cert_validators and _certv to _certverify X-Git-Tag: SQUID_4_0_5~17^2~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bbf79f12a3eb7f21cb13a226e8b891db37c41db5;p=thirdparty%2Fsquid.git Rename ./certv to ./cert_validators and _certv to _certverify --- diff --git a/CREDITS b/CREDITS index b0a973e7bb..4c13bbd8f2 100644 --- a/CREDITS +++ b/CREDITS @@ -1859,7 +1859,7 @@ src/repl/heap/store_heap_replacement.cc: ============================================================================== -src/security/certv/fake/security_fake_certv.pl.in: +src/security/cert_validators/fake/security_fake_certv.pl.in: (C) 2012 The Measurement Factory, Author: Tsantilas Christos diff --git a/configure.ac b/configure.ac index abafdb6a73..4700a7de14 100644 --- a/configure.ac +++ b/configure.ac @@ -2587,16 +2587,16 @@ AC_ARG_ENABLE(url-rewrite-helpers, m4_include([helpers/url_rewrite/modules.m4]) dnl Select security helpers to build -AC_ARG_ENABLE(security-certv-helpers, - AS_HELP_STRING([--enable-security-certv-helpers="list of helpers"], - [This option selects which security certificate verify helpers - to build and install as part of the normal build +AC_ARG_ENABLE(security-cert-validator-helpers, + AS_HELP_STRING([--enable-security-cert-validator-helpers="list of helpers"], + [This option selects which security certificate validator + helpers to build and install as part of the normal build process. The default is to attempt the build of all possible - helpers. Use --disable-security-certv-helpers to build none. - For a list of available helpers see the - src/security/certv/ directory.]),[ + helpers. Use --disable-security-cert-validator-helpers to + build none. For a list of available helpers see the + src/security/cert_validators/ directory.]),[ ]) -m4_include([src/security/certv/modules.m4]) +m4_include([src/security/cert_validators/modules.m4]) dnl Select storeid_rewrite helpers to build AC_ARG_ENABLE(storeid-rewrite-helpers, @@ -3894,8 +3894,8 @@ AC_CONFIG_FILES([ src/parser/Makefile src/repl/Makefile src/security/Makefile - src/security/certv/Makefile - src/security/certv/fake/Makefile + src/security/cert_validators/Makefile + src/security/cert_validators/fake/Makefile src/servers/Makefile src/snmp/Makefile src/ssl/Makefile diff --git a/doc/release-notes/release-4.sgml b/doc/release-notes/release-4.sgml index 0440f72eb8..4a600d798f 100644 --- a/doc/release-notes/release-4.sgml +++ b/doc/release-notes/release-4.sgml @@ -102,7 +102,7 @@ Most user-facing changes are reflected in squid.conf (see below). cert_valid.pl helper renamed

The cert_valid.pl testing helper has been renamed to - security_fake_certv, reflecting the Squid helper naming schema + security_fake_certverify, reflecting the Squid helper naming schema and that it does not actually perform any certificate checks.

This helper is also now built and installed by default. It is written in Perl @@ -333,8 +333,8 @@ This section gives an account of those changes in three categories: New options

- --enable-security-certv-helpers -

New directive to control which TLS/SSL certificate verification helpers + --enable-security-cert-validator-helpers +

New directive to control which TLS/SSL certificate validation helpers are built and installed.

One fake helper that it does not actually perform any certificate checks is provided for testing and example code for writing diff --git a/src/security/Makefile.am b/src/security/Makefile.am index bc8a644d25..e0b9508ce3 100644 --- a/src/security/Makefile.am +++ b/src/security/Makefile.am @@ -8,7 +8,7 @@ include $(top_srcdir)/src/Common.am include $(top_srcdir)/src/TestHeaders.am -SUBDIRS= certv +SUBDIRS= cert_validators noinst_LTLIBRARIES = libsecurity.la diff --git a/src/security/certv/Makefile.am b/src/security/cert_validators/Makefile.am similarity index 100% rename from src/security/certv/Makefile.am rename to src/security/cert_validators/Makefile.am diff --git a/src/security/cert_validators/fake/Makefile.am b/src/security/cert_validators/fake/Makefile.am new file mode 100644 index 0000000000..5d0547f4d1 --- /dev/null +++ b/src/security/cert_validators/fake/Makefile.am @@ -0,0 +1,27 @@ +## Copyright (C) 1996-2016 The Squid Software Foundation and contributors +## +## Squid software is distributed under GPLv2+ license and includes +## contributions from numerous individuals and organizations. +## Please see the COPYING and CONTRIBUTORS files for details. +## + +include $(top_srcdir)/src/Common.am + +libexec_SCRIPTS = security_fake_certverify +CLEANFILES += security_fake_certverify +EXTRA_DIST= \ + security_fake_certverify.pl.in \ + required.m4 + +security_fake_certverify: security_fake_certverify.pl.in + $(subst_perlshell) + +if ENABLE_POD2MAN_DOC +man_MANS = security_fake_certverify.8 +CLEANFILES += security_fake_certverify.8 +EXTRA_DIST += security_fake_certverify.8 + +security_fake_certverify.8: security_fake_certverify + pod2man --section=8 security_fake_certverify security_fake_certverify.8 + +endif diff --git a/src/security/certv/fake/required.m4 b/src/security/cert_validators/fake/required.m4 similarity index 79% rename from src/security/certv/fake/required.m4 rename to src/security/cert_validators/fake/required.m4 index 2048d7bc2c..60adc7fdca 100755 --- a/src/security/certv/fake/required.m4 +++ b/src/security/cert_validators/fake/required.m4 @@ -9,6 +9,6 @@ if test "x$PERL" != "x"; then BUILD_HELPER="fake" fi if test "x$POD2MAN" = "x"; then - AC_MSG_WARN([pod2man not found. security_fake_certv man(8) page will not be built]) + AC_MSG_WARN([pod2man not found. security_fake_certverify man(8) page will not be built]) fi diff --git a/src/security/certv/fake/security_fake_certv.pl.in b/src/security/cert_validators/fake/security_fake_certverify.pl.in similarity index 98% rename from src/security/certv/fake/security_fake_certv.pl.in rename to src/security/cert_validators/fake/security_fake_certverify.pl.in index 2ba6a028b2..1dc205d696 100755 --- a/src/security/certv/fake/security_fake_certv.pl.in +++ b/src/security/cert_validators/fake/security_fake_certverify.pl.in @@ -19,11 +19,11 @@ my $help = 0; =head1 NAME -security_fake_certv - A fake cert validation helper for Squid +security_fake_certverify - A fake cert validation helper for Squid =head1 SYNOPSIS -security_fake_certv [-d | --debug] [-h | --help] +security_fake_certverify [-d | --debug] [-h | --help] =over 8 diff --git a/src/security/cert_validators/modules.m4 b/src/security/cert_validators/modules.m4 new file mode 100644 index 0000000000..3fdabad692 --- /dev/null +++ b/src/security/cert_validators/modules.m4 @@ -0,0 +1,53 @@ +## Copyright (C) 1996-2016 The Squid Software Foundation and contributors +## +## Squid software is distributed under GPLv2+ license and includes +## contributions from numerous individuals and organizations. +## Please see the COPYING and CONTRIBUTORS files for details. +## + +# This file is supposed to run all the tests required to identify which +# configured modules are able to be built in this environment + +# FIXME: de-duplicate $enable_security_cert_validator_helpers list containing double entries. + +#define list of modules to build +auto_security_modules=no +if test "x${enable_security_cert_validator_helpers:=yes}" = "xyes" ; then + SQUID_LOOK_FOR_MODULES([$srcdir/src/security/cert_validators],[enable_security_cert_validator_helpers]) + auto_security_modules=yes +fi + +enable_security_cert_validator_helpers="`echo $enable_security_cert_validator_helpers| sed -e 's/,/ /g;s/ */ /g'`" +AC_MSG_NOTICE([Security certificate validator helper candidates: $enable_security_cert_validator_helpers]) +SECURITY_CERTV_HELPERS="" +if test "x$enable_security_cert_validator_helpers" != "xno" ; then + for helper in $enable_security_cert_validator_helpers; do + dir="$srcdir/src/security/cert_validators/$helper" + + # modules converted to autoconf macros already + # NP: we only need this list because m4_include() does not accept variables + if test "x$helper" = "xfake" ; then + m4_include([src/security/cert_validators/fake/required.m4]) + + # modules not yet converted to autoconf macros (or third party drop-in's) + elif test -f "$dir/config.test" && sh "$dir/config.test" "$squid_host_os"; then + BUILD_HELPER="$helper" + fi + + if test -d "$srcdir/src/security/cert_validators/$helper"; then + if test "$BUILD_HELPER" != "$helper"; then + if test "x$auto_security_modules" = "xyes"; then + AC_MSG_NOTICE([Security certificate validator helper $helper ... found but cannot be built]) + else + AC_MSG_ERROR([Security certificate validator helper $helper ... found but cannot be built]) + fi + else + SECURITY_CERTV_HELPERS="$SECURITY_CERTV_HELPERS $BUILD_HELPER" + fi + else + AC_MSG_ERROR([Security certificate validator helper $helper ... not found]) + fi + done +fi +AC_MSG_NOTICE([Security certificate validator helpers to be built: $SECURITY_CERTV_HELPERS]) +AC_SUBST(SECURITY_CERTV_HELPERS) diff --git a/src/security/certv/fake/Makefile.am b/src/security/certv/fake/Makefile.am deleted file mode 100644 index 32ec185f12..0000000000 --- a/src/security/certv/fake/Makefile.am +++ /dev/null @@ -1,27 +0,0 @@ -## Copyright (C) 1996-2016 The Squid Software Foundation and contributors -## -## Squid software is distributed under GPLv2+ license and includes -## contributions from numerous individuals and organizations. -## Please see the COPYING and CONTRIBUTORS files for details. -## - -include $(top_srcdir)/src/Common.am - -libexec_SCRIPTS = security_fake_certv -CLEANFILES += security_fake_certv -EXTRA_DIST= \ - security_fake_certv.pl.in \ - required.m4 - -security_fake_certv: security_fake_certv.pl.in - $(subst_perlshell) - -if ENABLE_POD2MAN_DOC -man_MANS = security_fake_certv.8 -CLEANFILES += security_fake_certv.8 -EXTRA_DIST += security_fake_certv.8 - -security_fake_certv.8: security_fake_certv - pod2man --section=8 security_fake_certv security_fake_certv.8 - -endif diff --git a/src/security/certv/modules.m4 b/src/security/certv/modules.m4 deleted file mode 100644 index ee36fe420d..0000000000 --- a/src/security/certv/modules.m4 +++ /dev/null @@ -1,53 +0,0 @@ -## Copyright (C) 1996-2016 The Squid Software Foundation and contributors -## -## Squid software is distributed under GPLv2+ license and includes -## contributions from numerous individuals and organizations. -## Please see the COPYING and CONTRIBUTORS files for details. -## - -# This file is supposed to run all the tests required to identify which -# configured modules are able to be built in this environment - -# FIXME: de-duplicate $enable_security_certv_helpers list containing double entries. - -#define list of modules to build -auto_security_modules=no -if test "x${enable_security_certv_helpers:=yes}" = "xyes" ; then - SQUID_LOOK_FOR_MODULES([$srcdir/src/security/certv],[enable_security_certv_helpers]) - auto_security_modules=yes -fi - -enable_security_certv_helpers="`echo $enable_security_certv_helpers| sed -e 's/,/ /g;s/ */ /g'`" -AC_MSG_NOTICE([Security certificate verify helper candidates: $enable_security_certv_helpers]) -SECURITY_CERTV_HELPERS="" -if test "x$enable_security_certv_helpers" != "xno" ; then - for helper in $enable_security_certv_helpers; do - dir="$srcdir/src/security/certv/$helper" - - # modules converted to autoconf macros already - # NP: we only need this list because m4_include() does not accept variables - if test "x$helper" = "xfake" ; then - m4_include([src/security/certv/fake/required.m4]) - - # modules not yet converted to autoconf macros (or third party drop-in's) - elif test -f "$dir/config.test" && sh "$dir/config.test" "$squid_host_os"; then - BUILD_HELPER="$helper" - fi - - if test -d "$srcdir/src/security/certv/$helper"; then - if test "$BUILD_HELPER" != "$helper"; then - if test "x$auto_security_modules" = "xyes"; then - AC_MSG_NOTICE([Security certificate verify helper $helper ... found but cannot be built]) - else - AC_MSG_ERROR([Security certificate verify helper $helper ... found but cannot be built]) - fi - else - SECURITY_CERTV_HELPERS="$SECURITY_CERTV_HELPERS $BUILD_HELPER" - fi - else - AC_MSG_ERROR([Security certificate verify helper $helper ... not found]) - fi - done -fi -AC_MSG_NOTICE([Security certificate verify helpers to be built: $SECURITY_CERTV_HELPERS]) -AC_SUBST(SECURITY_CERTV_HELPERS)