Rename ./certv to ./cert_validators and _certv to _certverify

diff --git a/CREDITS b/CREDITS
index b0a973e7bb4150b747659173869db277488a0c65..4c13bbd8f234637a0ad7c9813003cbd7cf39b7b2 100644 (file)
--- 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 abafdb6a735f491f6a7904045b80a3e7364cdd3e..4700a7de149ea53bbeebad4164ed4c061255b9af 100644 (file)
--- 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 0440f72eb8bd81293915c9242cf782b559779b79..4a600d798fbb2f17c34efab71f3579c5e1173df4 100644 (file)
--- 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).
 
 <sect1>cert_valid.pl helper renamed
 <p>The <em>cert_valid.pl</em> testing helper has been renamed to
-   <em>security_fake_certv</em>, reflecting the Squid helper naming schema
+   <em>security_fake_certverify</em>, reflecting the Squid helper naming schema
    and that it does not actually perform any certificate checks.
 
 <p>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:
 <sect1>New options<label id="newoptions">
 <p>
 <descrip>
-       <tag>--enable-security-certv-helpers</tag>
-       <p>New directive to control which TLS/SSL certificate verification helpers
+       <tag>--enable-security-cert-validator-helpers</tag>
+       <p>New directive to control which TLS/SSL certificate validation helpers
           are built and installed.
        <p>One <em>fake</em> 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 bc8a644d2501867218aa6ff62c367b4571fee8f0..e0b9508ce3919edea7a681bb0b5eb4ad979fcc39 100644 (file)
--- 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 (file)
index 0000000..5d0547f
--- /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 2048d7bc2c9df9ce3d7b584356c6bc3226a870fa..60adc7fdca78f8e53d891e096831fc337bfb8432 100755 (executable)
--- 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 2ba6a028b2e234d7311c45612edf0375168113b8..1dc205d696ea04b41e6953de2977d65213018ecf 100755 (executable)
--- 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 (file)
index 0000000..3fdabad
--- /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 (file)
index 32ec185..0000000
--- 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 (file)
index ee36fe4..0000000
--- 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)