Remove unused RSA Security copyrighted cryptoki.h header

diff --git a/configure b/configure
index 5144fba2ccf79a0fb73ec3487fc9b92140c37946..899e0536c7c483799aaa7fef4c10757bf39f8cd1 100755 (executable)
--- a/configure
+++ b/configure
@@ -23306,7 +23306,7 @@ ac_config_commands="$ac_config_commands chmod"
 # elsewhere if there's a good reason for doing so.
 #
 
-ac_config_files="$ac_config_files make/Makefile make/mkdep Makefile bin/Makefile bin/check/Makefile bin/confgen/Makefile bin/confgen/unix/Makefile bin/delv/Makefile bin/dig/Makefile bin/dnssec/Makefile bin/named/Makefile bin/named/unix/Makefile bin/nsupdate/Makefile bin/pkcs11/Makefile bin/plugins/Makefile bin/python/Makefile bin/python/isc/Makefile bin/python/isc/utils.py bin/python/isc/tests/Makefile bin/python/dnssec-checkds.py bin/python/dnssec-coverage.py bin/python/dnssec-keymgr.py bin/python/isc/__init__.py bin/python/isc/checkds.py bin/python/isc/coverage.py bin/python/isc/dnskey.py bin/python/isc/eventlist.py bin/python/isc/keydict.py bin/python/isc/keyevent.py bin/python/isc/keymgr.py bin/python/isc/keyseries.py bin/python/isc/keyzone.py bin/python/isc/policy.py bin/python/isc/rndc.py bin/python/isc/tests/dnskey_test.py bin/python/isc/tests/policy_test.py bin/rndc/Makefile bin/tests/Makefile bin/tests/headerdep_test.sh bin/tests/optional/Makefile bin/tests/pkcs11/Makefile bin/tests/pkcs11/benchmarks/Makefile bin/tests/system/Makefile bin/tests/system/conf.sh bin/tests/system/dlzexternal/Makefile bin/tests/system/dlzexternal/ns1/dlzs.conf bin/tests/system/dyndb/Makefile bin/tests/system/dyndb/driver/Makefile bin/tests/system/pipelined/Makefile bin/tests/system/rndc/Makefile bin/tests/system/rpz/Makefile bin/tests/system/rsabigexponent/Makefile bin/tests/system/tkey/Makefile bin/tools/Makefile contrib/scripts/check-secure-delegation.pl contrib/scripts/zone-edit.sh doc/Makefile doc/arm/Makefile doc/arm/noteversion.xml doc/arm/pkgversion.xml doc/arm/releaseinfo.xml doc/doxygen/Doxyfile doc/doxygen/Makefile doc/doxygen/doxygen-input-filter doc/misc/Makefile doc/tex/Makefile doc/tex/armstyle.sty doc/xsl/Makefile doc/xsl/isc-docbook-chunk.xsl doc/xsl/isc-docbook-html.xsl doc/xsl/isc-manpage.xsl doc/xsl/isc-notes-html.xsl lib/Makefile lib/bind9/Makefile lib/bind9/include/Makefile lib/bind9/include/bind9/Makefile lib/dns/Makefile lib/dns/include/Makefile lib/dns/include/dns/Makefile lib/dns/include/dst/Makefile lib/dns/tests/Makefile lib/irs/Makefile lib/irs/include/Makefile lib/irs/include/irs/Makefile lib/irs/include/irs/netdb.h lib/irs/include/irs/platform.h lib/irs/tests/Makefile lib/isc/pthreads/Makefile lib/isc/pthreads/include/Makefile lib/isc/pthreads/include/isc/Makefile lib/isc/Makefile lib/isc/include/Makefile lib/isc/include/isc/Makefile lib/isc/include/isc/platform.h lib/isc/include/pk11/Makefile lib/isc/include/pkcs11/Makefile lib/isc/tests/Makefile lib/isc/unix/Makefile lib/isc/unix/include/Makefile lib/isc/unix/include/isc/Makefile lib/isc/unix/include/pkcs11/Makefile lib/isccc/Makefile lib/isccc/include/Makefile lib/isccc/include/isccc/Makefile lib/isccc/tests/Makefile lib/isccfg/Makefile lib/isccfg/include/Makefile lib/isccfg/include/isccfg/Makefile lib/isccfg/tests/Makefile lib/ns/Makefile lib/ns/include/Makefile lib/ns/include/ns/Makefile lib/ns/tests/Makefile lib/samples/Makefile lib/samples/Makefile-postinstall unit/unittest.sh fuzz/Makefile"
+ac_config_files="$ac_config_files make/Makefile make/mkdep Makefile bin/Makefile bin/check/Makefile bin/confgen/Makefile bin/confgen/unix/Makefile bin/delv/Makefile bin/dig/Makefile bin/dnssec/Makefile bin/named/Makefile bin/named/unix/Makefile bin/nsupdate/Makefile bin/pkcs11/Makefile bin/plugins/Makefile bin/python/Makefile bin/python/isc/Makefile bin/python/isc/utils.py bin/python/isc/tests/Makefile bin/python/dnssec-checkds.py bin/python/dnssec-coverage.py bin/python/dnssec-keymgr.py bin/python/isc/__init__.py bin/python/isc/checkds.py bin/python/isc/coverage.py bin/python/isc/dnskey.py bin/python/isc/eventlist.py bin/python/isc/keydict.py bin/python/isc/keyevent.py bin/python/isc/keymgr.py bin/python/isc/keyseries.py bin/python/isc/keyzone.py bin/python/isc/policy.py bin/python/isc/rndc.py bin/python/isc/tests/dnskey_test.py bin/python/isc/tests/policy_test.py bin/rndc/Makefile bin/tests/Makefile bin/tests/headerdep_test.sh bin/tests/optional/Makefile bin/tests/pkcs11/Makefile bin/tests/pkcs11/benchmarks/Makefile bin/tests/system/Makefile bin/tests/system/conf.sh bin/tests/system/dlzexternal/Makefile bin/tests/system/dlzexternal/ns1/dlzs.conf bin/tests/system/dyndb/Makefile bin/tests/system/dyndb/driver/Makefile bin/tests/system/pipelined/Makefile bin/tests/system/rndc/Makefile bin/tests/system/rpz/Makefile bin/tests/system/rsabigexponent/Makefile bin/tests/system/tkey/Makefile bin/tools/Makefile contrib/scripts/check-secure-delegation.pl contrib/scripts/zone-edit.sh doc/Makefile doc/arm/Makefile doc/arm/noteversion.xml doc/arm/pkgversion.xml doc/arm/releaseinfo.xml doc/doxygen/Doxyfile doc/doxygen/Makefile doc/doxygen/doxygen-input-filter doc/misc/Makefile doc/tex/Makefile doc/tex/armstyle.sty doc/xsl/Makefile doc/xsl/isc-docbook-chunk.xsl doc/xsl/isc-docbook-html.xsl doc/xsl/isc-manpage.xsl doc/xsl/isc-notes-html.xsl lib/Makefile lib/bind9/Makefile lib/bind9/include/Makefile lib/bind9/include/bind9/Makefile lib/dns/Makefile lib/dns/include/Makefile lib/dns/include/dns/Makefile lib/dns/include/dst/Makefile lib/dns/tests/Makefile lib/irs/Makefile lib/irs/include/Makefile lib/irs/include/irs/Makefile lib/irs/include/irs/netdb.h lib/irs/include/irs/platform.h lib/irs/tests/Makefile lib/isc/pthreads/Makefile lib/isc/pthreads/include/Makefile lib/isc/pthreads/include/isc/Makefile lib/isc/Makefile lib/isc/include/Makefile lib/isc/include/isc/Makefile lib/isc/include/isc/platform.h lib/isc/include/pk11/Makefile lib/isc/include/pkcs11/Makefile lib/isc/tests/Makefile lib/isc/unix/Makefile lib/isc/unix/include/Makefile lib/isc/unix/include/isc/Makefile lib/isccc/Makefile lib/isccc/include/Makefile lib/isccc/include/isccc/Makefile lib/isccc/tests/Makefile lib/isccfg/Makefile lib/isccfg/include/Makefile lib/isccfg/include/isccfg/Makefile lib/isccfg/tests/Makefile lib/ns/Makefile lib/ns/include/Makefile lib/ns/include/ns/Makefile lib/ns/tests/Makefile lib/samples/Makefile lib/samples/Makefile-postinstall unit/unittest.sh fuzz/Makefile"
 
 
 #
@@ -24410,7 +24410,6 @@ do
     "lib/isc/unix/Makefile") CONFIG_FILES="$CONFIG_FILES lib/isc/unix/Makefile" ;;
     "lib/isc/unix/include/Makefile") CONFIG_FILES="$CONFIG_FILES lib/isc/unix/include/Makefile" ;;
     "lib/isc/unix/include/isc/Makefile") CONFIG_FILES="$CONFIG_FILES lib/isc/unix/include/isc/Makefile" ;;
-    "lib/isc/unix/include/pkcs11/Makefile") CONFIG_FILES="$CONFIG_FILES lib/isc/unix/include/pkcs11/Makefile" ;;
     "lib/isccc/Makefile") CONFIG_FILES="$CONFIG_FILES lib/isccc/Makefile" ;;
     "lib/isccc/include/Makefile") CONFIG_FILES="$CONFIG_FILES lib/isccc/include/Makefile" ;;
     "lib/isccc/include/isccc/Makefile") CONFIG_FILES="$CONFIG_FILES lib/isccc/include/isccc/Makefile" ;;

diff --git a/configure.ac b/configure.ac
index 7eee3cd0442c8c1c1af577e49e6298b240108abc..e626585aee64f113b8b871ff572cd8094749ee40 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2821,7 +2821,6 @@ AC_CONFIG_FILES([
        lib/isc/unix/Makefile
        lib/isc/unix/include/Makefile
        lib/isc/unix/include/isc/Makefile
-       lib/isc/unix/include/pkcs11/Makefile
        lib/isccc/Makefile
        lib/isccc/include/Makefile
        lib/isccc/include/isccc/Makefile

diff --git a/lib/isc/include/pk11/pk11.h b/lib/isc/include/pk11/pk11.h
index 5354d1c34d38dc0d3ff524220d317896d55c3748..983da5c9d99191178ec4a34b28c0d593413976b2 100644 (file)
--- a/lib/isc/include/pk11/pk11.h
+++ b/lib/isc/include/pk11/pk11.h
@@ -15,6 +15,7 @@
 /*! \file pk11/pk11.h */
 
 #include <stdbool.h>
+#include <unistd.h>
 
 #include <isc/lang.h>
 #include <isc/magic.h>
@@ -24,7 +25,7 @@
        ((void) (((rv = (func) args) == CKR_OK) || \
                 ((pk11_error_fatalcheck)(__FILE__, __LINE__, #func, rv), 0)))
 
-#include <pkcs11/cryptoki.h>
+#include <pkcs11/pkcs11.h>
 #include <pk11/site.h>
 
 ISC_LANG_BEGINDECLS

diff --git a/lib/isc/pk11.c b/lib/isc/pk11.c
index 1e7c503d8fe080595e0ccf9df06961f81ea0c8ef..2002c7bb81423c47e8f23242b2ed49b163170ccf 100644 (file)
--- a/lib/isc/pk11.c
+++ b/lib/isc/pk11.c
@@ -32,7 +32,6 @@
 #include <pk11/result.h>
 #include <pk11/site.h>
 
-#include <pkcs11/cryptoki.h>
 #include <pkcs11/pkcs11.h>
 #include <pkcs11/eddsa.h>
 

diff --git a/lib/isc/unix/include/Makefile.in b/lib/isc/unix/include/Makefile.in
index 2cbf021bf93fa985daeca77aaa19a85a4b45c4d0..d33c0fcb2c98a99d21213fba317a5fbca1f3907e 100644 (file)
--- a/lib/isc/unix/include/Makefile.in
+++ b/lib/isc/unix/include/Makefile.in
@@ -11,7 +11,7 @@ srcdir =      @srcdir@
 VPATH =                @srcdir@
 top_srcdir =   @top_srcdir@
 
-SUBDIRS =      isc pkcs11
+SUBDIRS =      isc
 TARGETS =
 
 @BIND9_MAKE_RULES@

diff --git a/lib/isc/unix/include/pkcs11/Makefile.in b/lib/isc/unix/include/pkcs11/Makefile.in
deleted file mode 100644 (file)
index 420fec1..0000000
--- a/lib/isc/unix/include/pkcs11/Makefile.in
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# See the COPYRIGHT file distributed with this work for additional
-# information regarding copyright ownership.
-
-srcdir =       @srcdir@
-VPATH =                @srcdir@
-top_srcdir =   @top_srcdir@
-
-HEADERS =      cryptoki.h
-SUBDIRS =
-TARGETS =
-
-@BIND9_MAKE_RULES@
-
-installdirs:
-       $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${includedir}/pkcs11
-
-install:: installdirs
-       for i in ${HEADERS}; do \
-               ${INSTALL_DATA} $(srcdir)/$$i ${DESTDIR}${includedir}/pkcs11 || exit 1; \
-       done
-
-uninstall::
-       for i in ${HEADERS}; do \
-               rm -f ${DESTDIR}${includedir}/pkcs11/$$i || exit 1; \
-       done

diff --git a/lib/isc/unix/include/pkcs11/cryptoki.h b/lib/isc/unix/include/pkcs11/cryptoki.h
deleted file mode 100644 (file)
index 7dc48b0..0000000
--- a/lib/isc/unix/include/pkcs11/cryptoki.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/* cryptoki.h include file for PKCS #11. */
-/*
- * Copyright (C) 2009  Internet Systems Consortium, Inc. ("ISC")
- *
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND ISC AND NETWORK ASSOCIATES DISCLAIMS
- * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE
- * FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR
- * IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-/* $Revision: 1.3 $ */
-
-/*
- * Portions Copyright RSA Security Inc.
- *
- * License to copy and use this software is granted provided that it is
- * identified as "RSA Security Inc. PKCS #11 Cryptographic Token Interface
- * (Cryptoki)" in all material mentioning or referencing this software.
-
- * License is also granted to make and use derivative works provided that
- * such works are identified as "derived from the RSA Security Inc. PKCS #11
- * Cryptographic Token Interface (Cryptoki)" in all material mentioning or 
- * referencing the derived work.
-
- * RSA Security Inc. makes no representations concerning either the 
- * merchantability of this software or the suitability of this software for
- * any particular purpose. It is provided "as is" without express or implied
- * warranty of any kind.
- */
-
-/* This is a sample file containing the top level include directives
- * for building Unix Cryptoki libraries and applications.
- */
-
-#ifndef ___CRYPTOKI_H_INC___
-#define ___CRYPTOKI_H_INC___
-
-#define CK_PTR *
-
-#define CK_DEFINE_FUNCTION(returnType, name) \
-  returnType name
-
-#define CK_DECLARE_FUNCTION(returnType, name) \
-  returnType name
-
-#define CK_DECLARE_FUNCTION_POINTER(returnType, name) \
-  returnType (* name)
-
-#define CK_CALLBACK_FUNCTION(returnType, name) \
-  returnType (* name)
-
-/* NULL is in unistd.h */
-#include <unistd.h>
-#define NULL_PTR NULL
-
-#undef CK_PKCS11_FUNCTION_INFO
-
-#include <pkcs11/pkcs11.h>
-
-#endif /* ___CRYPTOKI_H_INC___ */

diff --git a/lib/isc/unix/pk11_api.c b/lib/isc/unix/pk11_api.c
index 78c020a64c5aced4eef8592948846ba07216fa78..2b992029ab83f50a77eaf28318c97f0baef21b5c 100644 (file)
--- a/lib/isc/unix/pk11_api.c
+++ b/lib/isc/unix/pk11_api.c
@@ -23,7 +23,6 @@
 #include <isc/thread.h>
 #include <isc/util.h>
 
-#include <pkcs11/cryptoki.h>
 #include <pkcs11/pkcs11.h>
 
 #define KEEP_PKCS11_NAMES

diff --git a/lib/isc/win32/include/Makefile.in b/lib/isc/win32/include/Makefile.in
index 2cbf021bf93fa985daeca77aaa19a85a4b45c4d0..d33c0fcb2c98a99d21213fba317a5fbca1f3907e 100644 (file)
--- a/lib/isc/win32/include/Makefile.in
+++ b/lib/isc/win32/include/Makefile.in
@@ -11,7 +11,7 @@ srcdir =      @srcdir@
 VPATH =                @srcdir@
 top_srcdir =   @top_srcdir@
 
-SUBDIRS =      isc pkcs11
+SUBDIRS =      isc
 TARGETS =
 
 @BIND9_MAKE_RULES@

diff --git a/lib/isc/win32/include/pkcs11/Makefile.in b/lib/isc/win32/include/pkcs11/Makefile.in
deleted file mode 100644 (file)
index e9a85d4..0000000
--- a/lib/isc/win32/include/pkcs11/Makefile.in
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# See the COPYRIGHT file distributed with this work for additional
-# information regarding copyright ownership.
-
-srcdir =       @srcdir@
-VPATH =                @srcdir@
-top_srcdir =   @top_srcdir@
-
-HEADERS =      cryptoki.h
-SUBDIRS =
-TARGETS =
-
-@BIND9_MAKE_RULES@
-
-installdirs:
-       $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${includedir}/pkcs11
-
-install:: installdirs
-       for i in ${HEADERS}; do \
-               ${INSTALL_DATA} $(srcdir)/$$i ${DESTDIR}${includedir}/pkcs11 || exit 1; \
-       done

diff --git a/lib/isc/win32/include/pkcs11/cryptoki.h b/lib/isc/win32/include/pkcs11/cryptoki.h
deleted file mode 100644 (file)
index 2a681c4..0000000
--- a/lib/isc/win32/include/pkcs11/cryptoki.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/* cryptoki.h include file for PKCS #11. */\r
-/* $Revision: 1.2 $ */\r
-\r
-/* License to copy and use this software is granted provided that it is\r
- * identified as "RSA Security Inc. PKCS #11 Cryptographic Token Interface\r
- * (Cryptoki)" in all material mentioning or referencing this software.\r
-\r
- * License is also granted to make and use derivative works provided that\r
- * such works are identified as "derived from the RSA Security Inc. PKCS #11\r
- * Cryptographic Token Interface (Cryptoki)" in all material mentioning or \r
- * referencing the derived work.\r
-\r
- * RSA Security Inc. makes no representations concerning either the \r
- * merchantability of this software or the suitability of this software for\r
- * any particular purpose. It is provided "as is" without express or implied\r
- * warranty of any kind.\r
- */\r
-\r
-/* This is a sample file containing the top level include directives\r
- * for building Win32 Cryptoki libraries and applications.\r
- */\r
-\r
-#ifndef ___CRYPTOKI_H_INC___\r
-#define ___CRYPTOKI_H_INC___\r
-\r
-#pragma pack(push, cryptoki, 1)\r
-\r
-/* Specifies that the function is a DLL entry point. */\r
-#define CK_IMPORT_SPEC __declspec(dllimport)\r
-\r
-/* Define CRYPTOKI_EXPORTS during the build of cryptoki libraries. Do\r
- * not define it in applications.\r
- */\r
-#ifdef CRYPTOKI_EXPORTS\r
-/* Specified that the function is an exported DLL entry point. */\r
-#define CK_EXPORT_SPEC __declspec(dllexport) \r
-#else\r
-#define CK_EXPORT_SPEC CK_IMPORT_SPEC \r
-#endif\r
-\r
-/* Ensures the calling convention for Win32 builds */\r
-#define CK_CALL_SPEC __cdecl\r
-\r
-#define CK_PTR *\r
-\r
-#define CK_DEFINE_FUNCTION(returnType, name) \\r
-  returnType CK_EXPORT_SPEC CK_CALL_SPEC name\r
-\r
-#define CK_DECLARE_FUNCTION(returnType, name) \\r
-  returnType CK_EXPORT_SPEC CK_CALL_SPEC name\r
-\r
-#define CK_DECLARE_FUNCTION_POINTER(returnType, name) \\r
-  returnType CK_IMPORT_SPEC (CK_CALL_SPEC CK_PTR name)\r
-\r
-#define CK_CALLBACK_FUNCTION(returnType, name) \\r
-  returnType (CK_CALL_SPEC CK_PTR name)\r
-\r
-#ifndef NULL_PTR\r
-#define NULL_PTR 0\r
-#endif\r
-\r
-#include <pkcs11/pkcs11.h>\r
-\r
-#pragma pack(pop, cryptoki)\r
-\r
-#endif /* ___CRYPTOKI_H_INC___ */\r

diff --git a/lib/isc/win32/libisc.vcxproj.filters.in b/lib/isc/win32/libisc.vcxproj.filters.in
index d325ce99986d1e823035519d3f57cfadebc0adc3..22591f44db26b38669f7f000fcd1cebb843b4cfd 100644 (file)
--- a/lib/isc/win32/libisc.vcxproj.filters.in
+++ b/lib/isc/win32/libisc.vcxproj.filters.in
@@ -358,11 +358,6 @@
     <ClInclude Include="unistd.h">
       <Filter>Win32 Header Files</Filter>
     </ClInclude>
-@IF PKCS11
-    <ClInclude Include="include\pkcs11\cryptoki.h">
-      <Filter>Win32 Header Files</Filter>
-    </ClInclude>
-@END PKCS11
     <ClInclude Include="..\..\..\config.h">
       <Filter>Library Header Files</Filter>
     </ClInclude>

diff --git a/lib/isc/win32/libisc.vcxproj.in b/lib/isc/win32/libisc.vcxproj.in
index 664b180487feda02601f8d8cdf35045e5380b944..885d83c64e88bee14781c0afa4f8a50f07c328cd 100644 (file)
--- a/lib/isc/win32/libisc.vcxproj.in
+++ b/lib/isc/win32/libisc.vcxproj.in
@@ -398,9 +398,6 @@ copy InstallFiles ..\Build\Release\
     <ClInclude Include="..\openssl_shim.h" />
     <ClInclude Include="syslog.h" />
     <ClInclude Include="unistd.h" />
-@IF PKCS11
-    <ClInclude Include="include\pkcs11\cryptoki.h" />
-@END PKCS11
     <ClInclude Include="..\..\versions.h" />
   </ItemGroup>
   <ItemGroup>

diff --git a/util/copyrights b/util/copyrights
index 87765d5dd1d84ffc5675ddedf44bf65254b5fa4b..377b76cf7770a19c5fa367c760a3abb210aa5cbf 100644 (file)
--- a/util/copyrights
+++ b/util/copyrights
@@ -2322,7 +2322,6 @@
 ./lib/isc/unix/include/isc/stdtime.h           C       1999,2000,2001,2004,2005,2007,2011,2012,2016,2018,2019
 ./lib/isc/unix/include/isc/syslog.h            C       1999,2000,2001,2004,2005,2007,2016,2018,2019
 ./lib/isc/unix/include/isc/time.h              C       1998,1999,2000,2001,2004,2005,2006,2007,2008,2009,2012,2014,2015,2016,2017,2018,2019
-./lib/isc/unix/include/pkcs11/cryptoki.h       X       2014,2018,2019
 ./lib/isc/unix/interfaceiter.c                 C       1999,2000,2001,2002,2003,2004,2005,2007,2008,2014,2016,2017,2018,2019
 ./lib/isc/unix/meminfo.c                       C       2015,2016,2018,2019
 ./lib/isc/unix/net.c                           C       1999,2000,2001,2002,2003,2004,2005,2007,2008,2012,2013,2014,2015,2016,2017,2018,2019
@@ -2366,7 +2365,6 @@
 ./lib/isc/win32/include/isc/thread.h           C       1998,1999,2000,2001,2004,2005,2007,2009,2013,2016,2017,2018,2019
 ./lib/isc/win32/include/isc/time.h             C       1998,1999,2000,2001,2004,2006,2007,2008,2009,2012,2014,2015,2016,2017,2018,2019
 ./lib/isc/win32/include/isc/win32os.h          C       2002,2004,2007,2009,2015,2016,2018,2019
-./lib/isc/win32/include/pkcs11/cryptoki.h      X       2014,2018,2019
 ./lib/isc/win32/interfaceiter.c                        C       1999,2000,2001,2004,2007,2008,2009,2013,2014,2015,2016,2018,2019
 ./lib/isc/win32/ipv6.c                         C       1999,2000,2001,2004,2007,2016,2018,2019
 ./lib/isc/win32/libgen.h                       C       2009,2016,2018,2019