2733. [cleanup] Clean up coding style in pkcs11-* tools. [RT #20355]

2025-08-30 14:07:59 +00:00 · 2009-10-26 23:36:53 +00:00
parent c8aa7ce70d
commit 6f9c93a885
7 changed files with 768 additions and 549 deletions
--- a/2
+++ b/2
@@ -1,3 +1,5 @@
+2733.	[cleanup]	Clean up coding style in pkcs11-* tools. [RT #20355]
+
 2732.	[func]		Add optional filter-aaaa-on-v4 option, available
 			if built with './configure --enable-filter-aaaa'.
 			Filters out AAAA answers to clients connecting
--- a/bin/pkcs11/pkcs11-destroy.c
+++ b/bin/pkcs11/pkcs11-destroy.c
@@ -1,5 +1,49 @@
+/*
+ * 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.
+ */
+
+/*
+ * Portions copyright (c) 2008 Nominet UK.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/* $Id: pkcs11-destroy.c,v 1.7 2009/10/26 23:36:53 each Exp $ */
+
 /* pkcs11-destroy [-m module] [-s $slot] [-i $id | -l $label] [-p $pin] */

+/*! \file */
+
 #include <config.h>

 #include <stdio.h>
@@ -40,9 +84,10 @@ main(int argc, char *argv[])
 	CK_ATTRIBUTE search_template[] = {
 		{CKA_ID, &attr_id, sizeof(attr_id)}
 	};
+	char *pk11_provider;
+	unsigned int j, len;
 	extern char *optarg;
 	extern int optopt;
-    char *pk11_provider;

 	pk11_provider = getenv("PKCS11_PROVIDER");
 	if (pk11_provider != NULL)
@@ -67,7 +112,9 @@ main(int argc, char *argv[])
 			pin = (CK_UTF8CHAR *)optarg;
 			break;
 		case ':':
-	    fprintf(stderr, "Option -%c requires an operand\n", optopt);
+			fprintf(stderr,
+				"Option -%c requires an operand\n",
+				optopt);
 			errflg++;
 			break;
 		case '?':
@@ -76,12 +123,14 @@ main(int argc, char *argv[])
 			errflg++;
 		}
 	}
-    if (errflg || ((!id) && (!label))) {
-	fprintf(stderr,
-		"usage: pkcs11-destroy [-m module] [-s slot] "
+
+	if (errflg || (!id && (label != NULL))) {
+		fprintf(stderr, "Usage:\n");
+		fprintf(stderr, "\tpkcs11-destroy [-m module] [-s slot] "
 				"[-i id | -l label] [-p pin]\n");
 		exit(1);
 	}
+
 	if (id) {
 		printf("id %i\n", id);
 		attr_id[0] = (id >> 8) & 0xff;
@@ -114,9 +163,10 @@ main(int argc, char *argv[])
 		goto exit_program;
 	}

-    /* Login to the Token (Keystore) */
-    if (!pin)
+	if (pin == NULL)
 		pin = (CK_UTF8CHAR *)getpassphrase("Enter Pin: ");
+
+	/* Login to the Token (Keystore) */
 	rv = C_Login(hSession, CKU_USER, pin, strlen((char *)pin));
 	memset(pin, 0, strlen((char *)pin));
 	if (rv != CKR_OK) {
@@ -127,6 +177,7 @@ main(int argc, char *argv[])

 	rv = C_FindObjectsInit(hSession, search_template,
 		   ((id != 0) || (label != NULL)) ? 1 : 0); 
+
 	if (rv != CKR_OK) {
 		fprintf(stderr, "C_FindObjectsInit: Error = 0x%.8lX\n", rv);
 		error = 1;
@@ -149,14 +200,15 @@ main(int argc, char *argv[])
 			{CKA_LABEL, labelbuf, sizeof(labelbuf) - 1},
 			{CKA_ID, idbuf, sizeof(idbuf)}
 		};
-	unsigned int j, len;

 		memset(labelbuf, 0, sizeof(labelbuf));
 		memset(idbuf, 0, sizeof(idbuf));

 		rv = C_GetAttributeValue(hSession, akey[i], attr_template, 3);
 		if (rv != CKR_OK) {
-	    fprintf(stderr, "C_GetAttributeValue[%u]: rv = 0x%.8lX\n", i, rv);
+			fprintf(stderr,
+				"C_GetAttributeValue[%u]: rv = 0x%.8lX\n",
+				i, rv);
 			error = 1;
 			goto exit_search;
 		}
@@ -182,7 +234,9 @@ main(int argc, char *argv[])
 	for (i = 0; i < ulObjectCount; i++) {
 		rv = C_DestroyObject(hSession, akey[i]);
 		if (rv != CKR_OK) {
-	    fprintf(stderr, "C_DestroyObject[%u]: rv = 0x%.8lX\n", i, rv);
+			fprintf(stderr,
+				"C_DestroyObject[%u]: rv = 0x%.8lX\n",
+				i, rv);
 			error = 1;
 		}
 	}
--- a/bin/pkcs11/pkcs11-keygen.c
+++ b/bin/pkcs11/pkcs11-keygen.c
@@ -1,3 +1,45 @@
+/*
+ * 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.
+ */
+
+/*
+ * Portions copyright (c) 2008 Nominet UK.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/* $Id: pkcs11-keygen.c,v 1.9 2009/10/26 23:36:53 each Exp $ */
+
 /* pkcs11-keygen - pkcs11 rsa key generator
 *
 * create RSASHA1 key in the keystore of an SCA6000
@@ -11,6 +53,8 @@
 *
 */

+/*! \file */
+
 #include <config.h>

 #include <stdio.h>
@@ -80,9 +124,9 @@ main(int argc, char *argv[])
 		{CKA_ID, &idbuf, idlen}
 	};
 	CK_ULONG privatekey_attrcnt = 7;
+	char *pk11_provider;
 	extern char *optarg;
 	extern int optopt;
-    char *pk11_provider;

 	pk11_provider = getenv("PKCS11_PROVIDER");
 	if (pk11_provider != NULL)
@@ -116,7 +160,9 @@ main(int argc, char *argv[])
 			pin = (CK_UTF8CHAR *)optarg;
 			break;
 		case ':':
-            fprintf(stderr, "Option -%c requires an operand\n", optopt);
+			fprintf(stderr,
+				"Option -%c requires an operand\n",
+				optopt);
 			errflg++;
 			break;
 		case '?':
@@ -125,12 +171,12 @@ main(int argc, char *argv[])
 			errflg++;
 		}
 	}
-    if ((errflg) || (!modulusbits) || (!label)) {
-        fprintf(stderr,
-		"usage: pkcs11-keygen "
-		"[-P] [-m module] [-s slot] [-e] -b keysize\n"
-		"                     "
-		"-l label [-i id] [-p pin]\n");
+
+	if (errflg || !modulusbits || (label == NULL)) {
+		fprintf(stderr, "Usage:\n");
+		fprintf(stderr, "\tpkcs11-keygen -b keysize -l label\n");
+		fprintf(stderr, "\t              [-P] [-m module] "
+				"[-s slot] [-e] [-i id] [-p PIN]\n");
 		exit(2);
 	}
 	
@@ -198,8 +244,9 @@ main(int argc, char *argv[])
 	}

 	/* Login to the Token (Keystore) */
-    if (!pin)
+	if (pin == NULL)
 		pin = (CK_UTF8CHAR *)getpassphrase("Enter Pin: ");
+
 	rv = C_Login(hSession, CKU_USER, pin, strlen((char *)pin));
 	memset(pin, 0, strlen((char *)pin));
 	if (rv != CKR_OK) {
--- a/bin/pkcs11/pkcs11-list.c
+++ b/bin/pkcs11/pkcs11-list.c
@@ -1,5 +1,49 @@
+/*
+ * 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.
+ */
+
+/*
+ * Portions copyright (c) 2008 Nominet UK.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/* $Id: pkcs11-list.c,v 1.7 2009/10/26 23:36:53 each Exp $ */
+
 /* pkcs11-list [-P] [-m module] [-s slot] [-i $id | -l $label] [-p $pin] */

+/*! \file */
+
 #include <config.h>

 #include <stdio.h>
@@ -39,9 +83,9 @@ main(int argc, char *argv[])
 	CK_ATTRIBUTE search_template[] = {
 		{CKA_ID, &attr_id, sizeof(attr_id)}
 	};
+	char *pk11_provider;
 	extern char *optarg;
 	extern int optopt;
-    char *pk11_provider;

 	pk11_provider = getenv("PKCS11_PROVIDER");
 	if (pk11_provider != NULL)
@@ -69,7 +113,8 @@ main(int argc, char *argv[])
 			pin = (CK_UTF8CHAR *)optarg;
 			break;
 		case ':':
-	    fprintf(stderr, "Option -%c requires an operand\n", optopt);
+			fprintf(stderr, "Option -%c requires an operand\n",
+				optopt);
 			errflg++;
 			break;
 		case '?':
@@ -78,21 +123,25 @@ main(int argc, char *argv[])
 			errflg++;
 		}
 	}
+
 	if (errflg) {
-	fprintf(stderr,
-		"usage: pkcs11-list [-P] [-m module] [-s slot] "
+		fprintf(stderr, "Usage:\n");
+		fprintf(stderr, "\tpkcs11-list [-P] [-m module] [-s slot] "
 				"[-i id | -l label] [-p pin]\n");
 		exit(1);
 	}
-    if ((!id) && (!label))
+
+	if (!id && (label == NULL))
 		all = 1;
+
 	if (slot)
 		printf("slot %lu\n", slot);
+
 	if (id) {
 		printf("id %i\n", id);
 		attr_id[0] = (id >> 8) & 0xff;
 		attr_id[1] = id & 0xff;
-    } else if (label) {
+	} else if (label != NULL) {
 		printf("label %s\n", label);
 		search_template[0].type = CKA_LABEL;
 		search_template[0].pValue = label;
@@ -122,7 +171,7 @@ main(int argc, char *argv[])

 	/* Login to the Token (Keystore) */
 	if (!public) {
-	if (!pin)
+		if (pin == NULL)
 			pin = (CK_UTF8CHAR *)getpassphrase("Enter Pin: ");
 		rv = C_Login(hSession, CKU_USER, pin, strlen((char *)pin));
 		memset(pin, 0, strlen((char *)pin));
@@ -144,44 +193,53 @@ main(int argc, char *argv[])
 	while (ulObjectCount) {
 		rv = C_FindObjects(hSession, akey, 50, &ulObjectCount);
 		if (rv != CKR_OK) {
-	    fprintf(stderr, "C_FindObjects: Error = 0x%.8lX\n", rv);
+			fprintf(stderr,
+				"C_FindObjects: Error = 0x%.8lX\n",
+				rv);
 			error = 1;
 			goto exit_search;
 		}

 		for (i = 0; i < ulObjectCount; i++) {
+			unsigned int j, len;
+
 			CK_OBJECT_CLASS oclass = 0;
 			CK_BYTE labelbuf[64 + 1];
 			CK_BYTE idbuf[64];
-	    CK_ATTRIBUTE attr_template[] = {
+			CK_ATTRIBUTE template[] = {
 				{CKA_CLASS, &oclass, sizeof(oclass)},
 				{CKA_LABEL, labelbuf, sizeof(labelbuf) - 1},
 				{CKA_ID, idbuf, sizeof(idbuf)}
 			};
-	    unsigned int j, len;

 			memset(labelbuf, 0, sizeof(labelbuf));
 			memset(idbuf, 0, sizeof(idbuf));

-	    rv = C_GetAttributeValue(hSession, akey[i], attr_template, 3);
+			rv = C_GetAttributeValue(hSession, akey[i],
+						 template, 3);
 			if (rv != CKR_OK) {
 				fprintf(stderr,
-			"C_GetAttributeValue[%u]: rv = 0x%.8lX\n", i, rv);
+					"C_GetAttributeValue[%u]: "
+					"rv = 0x%.8lX\n",
+					i, rv);
 				if (rv == CKR_BUFFER_TOO_SMALL)
-		    fprintf(stderr, "%u too small: %lu %lu %lu\n", i,
-			    attr_template[0].ulValueLen,
-			    attr_template[1].ulValueLen,
-			    attr_template[2].ulValueLen);
+					fprintf(stderr,
+						"%u too small: %lu %lu %lu\n",
+						i,
+						template[0].ulValueLen,
+						template[1].ulValueLen,
+						template[2].ulValueLen);
 				error = 1;
 				continue;
 			}

-	    len = attr_template[2].ulValueLen;
+			len = template[2].ulValueLen;
 			printf("object[%u]: handle %lu class %lu "
 			       "label[%lu] '%s' id[%lu] ",
 			       i, akey[i], oclass,
-		   attr_template[1].ulValueLen, labelbuf,
-		   attr_template[2].ulValueLen);
+			       template[1].ulValueLen,
+			       labelbuf,
+			       template[2].ulValueLen);
 			if (len == 2) {
 				id = (idbuf[0] << 8) & 0xff00;
 				id |= idbuf[1] & 0xff;
@@ -193,7 +251,7 @@ main(int argc, char *argv[])
 					printf("0x");
 				for (j = 0; j < len; j++)
 					printf("%02x", idbuf[j]);
-		if (attr_template[2].ulValueLen > len)
+				if (template[2].ulValueLen > len)
 					printf("...\n");
 				else
 					printf("\n");
--- a/bin/pkcs11/unix/cryptoki.h
+++ b/bin/pkcs11/unix/cryptoki.h
@@ -1,7 +1,25 @@
 /* cryptoki.h include file for PKCS #11. */
-/* $Revision: 1.2 $ */
+/*
+ * 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 $ */

-/* License to copy and use this software is granted provided that it is
+/*
+ * 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.

--- a/bin/pkcs11/unix/unix.c
+++ b/bin/pkcs11/unix/unix.c
@@ -1,3 +1,23 @@
+/*
+ * 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.
+ */
+
+/* $Id */
+
+/*! \file */
+
 /* dynamic loader (ifndef FORCE_STATIC_PROVIDER) */

 #include <dlfcn.h>
--- a/bin/pkcs11/win32/win32.c
+++ b/bin/pkcs11/win32/win32.c
@@ -1,3 +1,23 @@
+/*
+ * 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.
+ */
+
+/* $Id */
+
+/*! \file */
+
 /* missing code for WIN32 */

 #include <windows.h>