diff -Nur bind-9.4.1-P1/bin/dnssec/dnssec-keygen.c bind-9.4.1-P1.pkcs11/bin/dnssec/dnssec-keygen.c
--- bind-9.4.1-P1/bin/dnssec/dnssec-keygen.c	2007-01-17 16:06:11.000000000 -0800
+++ bind-9.4.1-P1.pkcs11/bin/dnssec/dnssec-keygen.c	2007-09-14 15:44:15.000000000 -0700
@@ -127,6 +127,8 @@
 	int		options = DST_TYPE_PRIVATE | DST_TYPE_PUBLIC;
 	int		dbits = 0;
 
+        pkcs11_initlib(NULL);
+
 	if (argc == 1)
 		usage();
 
@@ -135,7 +137,7 @@
 	dns_result_register();
 
 	while ((ch = isc_commandline_parse(argc, argv,
-					   "a:b:c:d:ef:g:kn:t:p:s:r:v:h")) != -1)
+					   "a:b:c:d:ef:g:kn:t:p:s:r:v:hP:")) != -1)
 	{
 	    switch (ch) {
 		case 'a':
@@ -201,6 +203,9 @@
 			if (*endp != '\0')
 				fatal("-v must be followed by a number");
 			break;
+	    case 'P':
+	      pkcs11_initlib(isc_commandline_argument);
+	      break;
 
 		case 'h':
 			usage();
diff -Nur bind-9.4.1-P1/bin/dnssec/dnssec-signzone.c bind-9.4.1-P1.pkcs11/bin/dnssec/dnssec-signzone.c
--- bind-9.4.1-P1/bin/dnssec/dnssec-signzone.c	2006-08-30 16:01:54.000000000 -0700
+++ bind-9.4.1-P1.pkcs11/bin/dnssec/dnssec-signzone.c	2007-09-14 15:45:06.000000000 -0700
@@ -1852,6 +1852,8 @@
 	isc_buffer_t b;
 	int len;
 
+	pkcs11_initlib(NULL);
+
 	masterstyle = &dns_master_style_explicitttl;
 
 	check_result(isc_app_start(), "isc_app_start");
@@ -1863,7 +1865,7 @@
 	dns_result_register();
 
 	while ((ch = isc_commandline_parse(argc, argv,
-					   "ac:d:e:f:ghi:I:j:k:l:n:N:o:O:pr:s:Stv:z"))
+					   "ac:d:e:f:ghi:I:j:k:l:n:N:o:O:pr:s:Stv:zP:"))
 	       != -1) {
 		switch (ch) {
 		case 'a':
@@ -1984,6 +1986,10 @@
 		case 'z':
 			ignoreksk = ISC_TRUE;
 			break;
+
+                case 'P':
+		  pkcs11_initlib(isc_commandline_argument);
+                  break;
 		}
 	}
 
diff -Nur bind-9.4.1-P1/lib/dns/cryptoki.h bind-9.4.1-P1.pkcs11/lib/dns/cryptoki.h
--- bind-9.4.1-P1/lib/dns/cryptoki.h	1969-12-31 16:00:00.000000000 -0800
+++ bind-9.4.1-P1.pkcs11/lib/dns/cryptoki.h	2007-08-06 17:03:44.000000000 -0700
@@ -0,0 +1,87 @@
+/* cryptoki.h include file for PKCS #11. */
+/* $Revision: 1.4 $ */
+
+/* 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 Win32 Cryptoki libraries and applications.
+ */
+
+#ifndef ___CRYPTOKI_H_INC___
+#define ___CRYPTOKI_H_INC___
+
+#ifdef WIN32
+#pragma pack(push, cryptoki, 1)
+
+/* Specifies that the function is a DLL entry point. */
+#define CK_IMPORT_SPEC __declspec(dllimport)
+
+/* Define CRYPTOKI_EXPORTS during the build of cryptoki libraries. Do
+ * not define it in applications.
+ */
+#ifdef CRYPTOKI_EXPORTS
+/* Specified that the function is an exported DLL entry point. */
+#define CK_EXPORT_SPEC __declspec(dllexport) 
+#else
+#define CK_EXPORT_SPEC CK_IMPORT_SPEC 
+#endif
+
+/* Ensures the calling convention for Win32 builds */
+#define CK_CALL_SPEC __cdecl
+
+#define CK_PTR *
+
+#define CK_DEFINE_FUNCTION(returnType, name) \
+  returnType CK_EXPORT_SPEC CK_CALL_SPEC name
+
+#define CK_DECLARE_FUNCTION(returnType, name) \
+  returnType CK_EXPORT_SPEC CK_CALL_SPEC name
+
+#define CK_DECLARE_FUNCTION_POINTER(returnType, name) \
+  returnType CK_IMPORT_SPEC (CK_CALL_SPEC CK_PTR name)
+
+#define CK_CALLBACK_FUNCTION(returnType, name) \
+  returnType (CK_CALL_SPEC CK_PTR name)
+
+#else // not Windows
+
+#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)
+
+#endif
+
+#ifndef NULL_PTR
+#define NULL_PTR 0
+#endif
+
+#include "pkcs11.h"
+
+#ifdef WIN32
+#pragma pack(pop, cryptoki)
+#endif
+
+#endif /* ___CRYPTOKI_H_INC___ */
diff -Nur bind-9.4.1-P1/lib/dns/dst_api.c bind-9.4.1-P1.pkcs11/lib/dns/dst_api.c
--- bind-9.4.1-P1/lib/dns/dst_api.c	2006-01-27 15:57:44.000000000 -0800
+++ bind-9.4.1-P1.pkcs11/lib/dns/dst_api.c	2007-08-06 17:03:44.000000000 -0700
@@ -658,13 +658,13 @@
 	key = get_key_struct(name, alg, flags, protocol, bits, rdclass, mctx);
 	if (key == NULL)
 		return (ISC_R_NOMEMORY);
-
+#ifdef FOOP
 	if (bits == 0) { /*%< NULL KEY */
 		key->key_flags |= DNS_KEYTYPE_NOKEY;
 		*keyp = key;
 		return (ISC_R_SUCCESS);
 	}
-
+#endif /* FOOP */
 	if (key->func->generate == NULL) {
 		dst_key_free(&key);
 		return (DST_R_UNSUPPORTEDALG);
@@ -672,6 +672,11 @@
 
 	ret = key->func->generate(key, param);
 	if (ret != ISC_R_SUCCESS) {
+          if(bits == 0 && ret == DST_R_UNSUPPORTEDALG) {
+            key->key_flags |= DNS_KEYTYPE_NOKEY;
+            *keyp = key;
+            return (ISC_R_SUCCESS);
+          }
 		dst_key_free(&key);
 		return (ret);
 	}
diff -Nur bind-9.4.1-P1/lib/dns/opensslrsa_link.c bind-9.4.1-P1.pkcs11/lib/dns/opensslrsa_link.c
--- bind-9.4.1-P1/lib/dns/opensslrsa_link.c	2006-11-07 13:28:49.000000000 -0800
+++ bind-9.4.1-P1.pkcs11/lib/dns/opensslrsa_link.c	2007-09-17 16:56:38.000000000 -0700
@@ -19,6 +19,8 @@
  * Principal Author: Brian Wellington
  * $Id: opensslrsa_link.c,v 1.1.6.11 2006/11/07 21:28:49 marka Exp $
  */
+#define PKCS11
+
 #ifdef OPENSSL
 
 #include <config.h>
@@ -97,6 +99,33 @@
 	} while (0)
 #endif
 
+
+
+
+#ifdef PKCS11
+#include <dns/name.h>
+#define MAXPATHLEN 512
+static int use_pkcs11=0; /*off by default. on if PKCS11_LIBRARY_PATH defined*/
+/* 
+ * Caution: since this loads a 3rd party library and initializes it, 
+ * it may reset signal() handling and the like. So pkcs11_initlib must 
+ * be called in main() before anything else. 
+ * Will check for PKCS11_LIBRARY_PATH lib and set.
+ */
+int pkcs11_initlib(char *pin);
+static int pkcs11_RSA_sign(dst_key_t *key,unsigned char *msg,unsigned int mlen,unsigned char *sign,unsigned int *slen);
+static int pkcs11_parse(dst_key_t *key,isc_lex_t *lexer,unsigned char *modulus,int *modulus_len,unsigned char *pubexponent,int *pubexponent_len);
+static void pkcs11_free(void *cb);
+#define PKCS11_MAGIC 0x5A62
+static int ispkcs11(const dst_key_t *key);
+static int pkcs11_getkey(dst_key_t *key,unsigned char *modulus,int *modulus_len,unsigned char *pubexponent,int *pubexponent_len);
+static int pkcs11_genkey(dst_key_t *key,unsigned char *modulus,int *modulus_len,unsigned char *pubexponent,int *pubexponent_len);
+static int pkcs11_writeparams(const dst_key_t *key,char *fname);
+#endif /* PKCS11 */
+
+
+
+
 static isc_result_t opensslrsa_todns(const dst_key_t *key, isc_buffer_t *data);
 
 static isc_result_t
@@ -200,7 +229,13 @@
 		digestlen = ISC_SHA1_DIGESTLENGTH;
 	}
 
-	status = RSA_sign(type, digest, digestlen, r.base, &siglen, rsa);
+	if(ispkcs11(key)) {
+	  siglen = r.length; /* pass size of buffer to signer */
+	  status = pkcs11_RSA_sign(key,digest,digestlen,r.base,&siglen);
+	  if(status == 0) status = 1; else status = 0;
+	} else {
+	  status = RSA_sign(type, digest, digestlen, r.base, &siglen, rsa);
+	}
 	if (status == 0) {
 		err = ERR_peek_error_line(&file, &line);
 		if (err != 0U) {
@@ -246,6 +281,7 @@
 
 	status = RSA_verify(type, digest, digestlen, sig->base,
 			    RSA_size(rsa), rsa);
+
 	if (status == 0)
 		return (dst__openssl_toresult(DST_R_VERIFYFAILURE));
 
@@ -291,8 +327,78 @@
 	RSA *rsa = RSA_new();
 	BIGNUM *e = BN_new();
 
-	if (rsa == NULL || e == NULL)
-		goto err;
+        if (rsa == NULL || e == NULL)
+          goto err;
+
+#ifdef PKCS11
+	/*
+	 * load public key from HSM as well as a "handle" to priv info.
+	 */
+	if(key->key_size == 0) { /* "dnssec-genkey -b 0" */
+	  unsigned char pkcs11_modulus[512],pkcs11_publicexponent[512];
+          int pkcs11_modulus_len=0;
+	  int pkcs11_publicexponent_len=0;
+
+	  if(pkcs11_getkey(key,pkcs11_modulus,&pkcs11_modulus_len,pkcs11_publicexponent,&pkcs11_publicexponent_len)) {
+	    goto err;
+	  }
+	  
+	  BN_free(e);
+	  SET_FLAGS(rsa);
+	  rsa->d = key->opaque; /* from pkcs11_getkey(). fakes out ispriv */
+	  key->opaque = rsa;    /* do this to fit in */
+	  
+	  rsa->n = BN_bin2bn(pkcs11_modulus,pkcs11_modulus_len,NULL);
+	  rsa->e = BN_bin2bn(pkcs11_publicexponent,pkcs11_publicexponent_len,NULL);
+	  {
+	    isc_buffer_t dnsbuf;
+	    unsigned char dns_array[DST_KEY_MAXSIZE];
+	    isc_region_t r;
+	    isc_result_t ret;
+	    char namestr[512];
+	    
+	    isc_buffer_init(&dnsbuf, dns_array, sizeof(dns_array));
+	    ret = dst_key_todns(key,&dnsbuf);
+	    if (ret != ISC_R_SUCCESS)
+	      return (ret);
+	    
+	    isc_buffer_usedregion(&dnsbuf, &r);
+	    key->key_id = dst_region_computeid(&r,key->key_alg);
+	    dns_name_format(key->key_name,namestr,sizeof(namestr));
+	    fprintf(stderr,"Label smart card K%s.+%03d+%05d\n",namestr,key->key_alg,key->key_id);
+	  }
+	  key->key_size = BN_num_bits(rsa->n);
+	  
+	  return (ISC_R_SUCCESS);
+	}
+
+	if(use_pkcs11) { /* generate a new key in the HSM */
+	  unsigned char pkcs11_modulus[512],pkcs11_publicexponent[512];
+          int pkcs11_modulus_len=0;
+	  int pkcs11_publicexponent_len=0;
+
+	  if(pkcs11_genkey(key,pkcs11_modulus,&pkcs11_modulus_len,pkcs11_publicexponent,&pkcs11_publicexponent_len)) {
+	    goto err;
+	  }
+	  
+	  BN_free(e);
+	  SET_FLAGS(rsa);
+
+	  rsa->d = key->opaque; /* from pkcs11_getkey(). fakes out ispriv */
+	  key->opaque = rsa;    /* do this to fit in */
+	  
+	  rsa->n = BN_bin2bn(pkcs11_modulus,pkcs11_modulus_len,NULL);
+	  rsa->e = BN_bin2bn(pkcs11_publicexponent,pkcs11_publicexponent_len,NULL);
+	  key->key_size = BN_num_bits(rsa->n);
+	  return (ISC_R_SUCCESS);
+	}
+
+
+#else /* PKCS11 */
+	if(key->key_size == 0) {
+	  return (DST_R_UNSUPPORTEDALG);
+	}
+#endif /* PKCS11 */
 
 	if (exp == 0) {
 		/* RSA_F4 0x10001 */
@@ -312,7 +418,6 @@
 		key->opaque = rsa;
 		return (ISC_R_SUCCESS);
 	}
-
 err:
 	if (e != NULL)
 		BN_free(e);
@@ -340,12 +445,20 @@
 static isc_boolean_t
 opensslrsa_isprivate(const dst_key_t *key) {
 	RSA *rsa = (RSA *) key->opaque;
+
 	return (ISC_TF(rsa != NULL && rsa->d != NULL));
 }
 
 static void
 opensslrsa_destroy(dst_key_t *key) {
 	RSA *rsa = key->opaque;
+
+#ifdef PKCS11
+	if(ispkcs11(key)) {
+	  pkcs11_free((void *)rsa->d);
+	  rsa->d = NULL;
+	}
+#endif
 	RSA_free(rsa);
 	key->opaque = NULL;
 }
@@ -454,6 +567,17 @@
 	if (key->opaque == NULL)
 		return (DST_R_NULLKEY);
 
+        if(ispkcs11(key)) {
+          char namestr[512],fname[512];
+
+          dns_name_format(key->key_name,namestr,sizeof(namestr));
+	  if(namestr[0] != '.') strcat(namestr,"."); else { /* root */ }
+	  if(directory) sprintf(fname,"%s/K%s+%03d+%05u.private",directory,namestr,key->key_alg,key->key_id);
+	  else sprintf(fname,"K%s+%03d+%05u.private",namestr,key->key_alg,key->key_id);
+	  pkcs11_writeparams(key,fname);
+          return (ISC_R_SUCCESS);
+        }
+
 	rsa = (RSA *) key->opaque;
 
 	for (i = 0; i < 8; i++) {
@@ -536,8 +660,46 @@
 
 	/* read private key file */
 	ret = dst__privstruct_parse(key, DST_ALG_RSA, lexer, mctx, &priv);
-	if (ret != ISC_R_SUCCESS)
-		return (ret);
+	if (ret != ISC_R_SUCCESS) {
+	  unsigned char pkcs11_modulus[512],pkcs11_publicexponent[512];
+	  int pkcs11_modulus_len=0;
+	  int pkcs11_publicexponent_len=0;
+
+	  if(key->opaque) {
+	    fprintf(stderr,"pkcs11: warning: pkcs11_parse() already called\n");
+	  }
+	  if(pkcs11_parse(key,lexer,pkcs11_modulus,&pkcs11_modulus_len,pkcs11_publicexponent,&pkcs11_publicexponent_len)) {
+	    return (ret);
+	  } else {
+	    /*
+	     * load public key from HSM as well as a "handle" to priv info.
+	     */
+	    rsa = RSA_new();
+	    SET_FLAGS(rsa);
+	    rsa->d = key->opaque; /* from pkcs11_parse(). fakes out ispriv */
+	    key->opaque = rsa; /* do this to fit in */
+
+	    rsa->n = BN_bin2bn(pkcs11_modulus,pkcs11_modulus_len,NULL);
+	    rsa->e = BN_bin2bn(pkcs11_publicexponent,pkcs11_publicexponent_len,NULL);
+	    {
+	      isc_buffer_t dnsbuf;
+	      unsigned char dns_array[DST_KEY_MAXSIZE];
+	      isc_region_t r;
+	      isc_result_t ret;
+
+	      isc_buffer_init(&dnsbuf, dns_array, sizeof(dns_array));
+	      ret = dst_key_todns(key, &dnsbuf);
+	      if (ret != ISC_R_SUCCESS)
+                return (ret);
+
+	      isc_buffer_usedregion(&dnsbuf,&r);
+	      key->key_id = dst_region_computeid(&r,key->key_alg);
+	    }
+	    key->key_size = BN_num_bits(rsa->n);
+
+	    return ISC_R_SUCCESS;
+	  }
+	}
 
 	rsa = RSA_new();
 	if (rsa == NULL)
@@ -627,3 +789,1112 @@
 
 #endif /* OPENSSL */
 /*! \file */
+
+
+
+
+/******************************************************************
+ *
+ * Copyright (C) 2007 Internet Corporation for Assigned Names
+ *                         and Numbers ("ICANN")
+ *
+ * Permission to use, copy, modify, and 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 ICANN DISCLAIMS ALL WARRANTIES WITH
+ * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS.  IN NO EVENT SHALL ICANN 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.
+ *
+ * Author: RHLamb 8/2007
+ *   pkcs11 support 
+ *
+ * add LFLAGS -ldl for dynamic library loading
+ ******************************************************************/
+#include <stdio.h>
+#include <string.h>
+#include <ctype.h>
+#include <dlfcn.h>
+#include <malloc.h>
+#include "cryptoki.h"
+
+#include <isc/lex.h>
+
+#include <openssl/rsa.h>
+#include <openssl/err.h>
+#include <openssl/x509.h>
+
+typedef unsigned char uint8;
+#define min(x,y) ((x)<(y)?(x):(y))
+#define MAX_SLOTS 16
+#define MAX_KEYS 64
+
+/* 
+ * pkcs11 driver only supports one session at a time 
+ * warning - forces pin saving in memory
+ */
+#define PKCS11_SINGLE_SESSION
+
+typedef struct {
+  long magic;
+  CK_SESSION_HANDLE sh;
+  CK_OBJECT_HANDLE pub;
+  CK_OBJECT_HANDLE priv;
+  char *library;
+  char *pin;
+  char *label;
+  int reader;
+  int slot;
+  char *id; /* CKA_ID on token */
+} pkcs11_cb;
+
+static int pkcs11_login(pkcs11_cb *p11,char *keystr);
+static int pkcs11_logout(pkcs11_cb *p11);
+static char *cnvtid2str(uint8 *p,int len);
+static char *cnvtlabel2str(uint8 *p,int len);
+static char *utf82ascii(uint8 *p,int n);
+static int pkcs11_label_exists(CK_SESSION_HANDLE sh,char *label);
+static int pkcs11_delete_object(CK_SESSION_HANDLE sh,CK_OBJECT_HANDLE hObj);
+static int hex2i(char c);
+
+static const char *pkcs11_library=NULL;
+static CK_FUNCTION_LIST_PTR fnclist;
+static char *pkcs11_pin;
+
+static int pkcs11_parse(dst_key_t *key,isc_lex_t *lexer,uint8 *modulus,int *modulus_len,uint8 *pub_exponent,int *pub_exponent_len)
+{
+  int ret;
+  pkcs11_cb *p11;
+
+  ret = -1;
+  if(key->opaque) return 0;
+
+  if((p11=(pkcs11_cb *)malloc(sizeof(pkcs11_cb))) == NULL) return ret;
+  memset(p11,0,sizeof(pkcs11_cb));
+  p11->magic = PKCS11_MAGIC;
+
+  /* ISC token handling */
+  {
+    isc_token_t token;
+    unsigned int opt = ISC_LEXOPT_EOL;
+    isc_result_t ret;
+    char *p,*q;
+#define DST_AS_STR(t) ((t).value.as_textregion.base)
+
+    while(1) {
+      ret = isc_lex_gettoken(lexer,opt,&token);
+      if(ret == ISC_R_EOF) break;
+      else if(ret != ISC_R_SUCCESS) return ret;
+      if(token.type != isc_tokentype_string) continue;
+      q = DST_AS_STR(token);
+      
+      if(*q == '#') continue;
+      if((p=strchr(q,':')) == NULL) continue;
+      *p++ = '\0';
+
+      /*
+       * if p11->library is NULL, then assume OpenSC libs.
+       */
+      if(p11->library == NULL && strcasecmp(q,"library") == 0) p11->library = strdup(p);
+      if(strcasecmp(q,"reader") == 0) p11->reader = atoi(p);
+      if(strcasecmp(q,"slot") == 0) p11->slot = atoi(p);
+      /* 
+       * if p11->pin is NULL, then assume no Login needed;
+       * if p11->pin is a zero len string, ask for PIN at login.
+       */ 
+      if(p11->pin == NULL && strcasecmp(q,"pin") == 0) {
+	if(strlen(p) > 0) p11->pin = strdup(p);
+      }
+      /*
+       * note: id is in hex format for smart cards. arb bytes for HSM
+       */
+      if(p11->id == NULL && strcasecmp(q,"id") == 0) p11->id = strdup(p);
+      /* UTF-8 should be ok */
+      if(p11->label == NULL && strcasecmp(q,"label") == 0) p11->label = strdup(p);
+    }
+    if(p11->pin == NULL && pkcs11_pin && strlen(pkcs11_pin) > 0) {
+      p11->pin = strdup(pkcs11_pin);
+    }
+  }
+
+  {
+    int i,j;
+    CK_SESSION_HANDLE sh;
+    int rv;
+    CK_OBJECT_CLASS  privClass = CKO_PRIVATE_KEY;
+    CK_OBJECT_CLASS  pubClass = CKO_PUBLIC_KEY;
+    CK_ATTRIBUTE     template[5];
+    CK_OBJECT_HANDLE hPub,hKeys[MAX_KEYS];
+    int ofound;
+    int ts;
+    uint8 id[128];
+    char *p;
+    CK_ATTRIBUTE getattributes[] = {
+      {CKA_MODULUS_BITS, NULL_PTR, 0},
+      {CKA_MODULUS, NULL_PTR, 0},
+      {CKA_PUBLIC_EXPONENT, NULL_PTR, 0},
+      {CKA_ID, NULL_PTR, 0},
+      {CKA_LABEL, NULL_PTR, 0}
+    };
+
+    if(pkcs11_login(p11,isc_lex_getsourcename(lexer))) goto endit;
+    sh = p11->sh;
+
+    ts = 0;
+    template[ts].type = CKA_CLASS;
+    template[ts].pValue = &pubClass;
+    template[ts].ulValueLen = sizeof(pubClass);
+    ts++;
+    if(p11->label) {
+      template[ts].type = CKA_LABEL;
+      template[ts].pValue = p11->label;
+      template[ts].ulValueLen = strlen(p11->label);
+      ts++;
+    }
+    if(p11->id) {
+      j = min(strlen(p11->id)/2,sizeof(id));
+      for(p=p11->id,i=0;i<j;i++,p += 2) id[i] = hex2i(*p)<<4 | hex2i(*(p+1));
+      template[ts].type = CKA_ID;
+      template[ts].pValue = id;
+      template[ts].ulValueLen = j;
+      ts++;
+    }
+    rv = fnclist->C_FindObjectsInit(sh,template,ts);
+    if(rv != CKR_OK) goto endit;
+    rv = fnclist->C_FindObjects(sh,hKeys,MAX_KEYS,(CK_RV *)&ofound);
+    if(rv != CKR_OK) goto endit;
+    rv = fnclist->C_FindObjectsFinal(sh);
+    if(rv != CKR_OK) goto endit;
+    if(ofound <= 0) {
+      fprintf(stderr,"pkcs11: error: No public keys labeled \"%s\" found\n",p11->label);
+      goto endit;
+    }
+    /*printf("pkcs11: Found %d public keys\n",ofound);*/
+    if(ofound > 1) {
+      fprintf(stderr,"pkcs11: error: Found %d duplicate keys labeled \"%s\"\n",ofound,p11->label);
+      goto endit;
+    }
+    p11->pub = hKeys[0];
+
+    /* 
+     * Get corresponding private key 
+     * For this to work it must have the same LABEL and ID
+     */
+    template[0].type = CKA_CLASS;
+    template[0].pValue = &privClass;
+    template[0].ulValueLen = sizeof(privClass);
+    rv = fnclist->C_FindObjectsInit(sh,template,ts);
+    if(rv != CKR_OK) goto endit;
+    rv = fnclist->C_FindObjects(sh,hKeys,MAX_KEYS,(CK_RV *)&ofound);
+    if(rv != CKR_OK) goto endit;
+    rv = fnclist->C_FindObjectsFinal(sh);
+    if(rv != CKR_OK) goto endit;
+    if(ofound <= 0) {
+      fprintf(stderr,"pkcs11: error: No private keys labeled \"%s\" found\n",p11->label);
+      goto endit;
+    }
+    /*printf("pkcs11: Found %d private keys\n",ofound);*/
+    if(ofound > 1) {
+      fprintf(stderr,"pkcs11: error: Found %d duplicate keys labeled \"%s\"\n",ofound,p11->label);
+      goto endit;
+    }
+
+    p11->priv = hKeys[0];
+
+    /* extract atributes for this key */
+    hPub = p11->pub;
+    ts = (int)(sizeof(getattributes)/sizeof(CK_ATTRIBUTE));
+    if((rv=fnclist->C_GetAttributeValue(sh,hPub,getattributes,ts)) != CKR_OK) {
+      fprintf(stderr,"pkcs11: C_GetAttributeValue: rv = 0x%.8X\n",rv);
+      goto endit;
+    }
+    for(i=0;i<ts;i++) {
+      getattributes[i].pValue = malloc(getattributes[i].ulValueLen *sizeof(CK_VOID_PTR));
+      if(getattributes[i].pValue == NULL) {
+	for(j=0;j<i;j++) free(getattributes[j].pValue);
+	printf("pkcs11: Failed to alloc memory...NULL attributes\n");
+	goto endit;
+      }
+    }
+    /* Call again to get actual attributes */
+    if((rv=fnclist->C_GetAttributeValue(sh,hPub,getattributes,ts)) != CKR_OK) {
+      fprintf(stderr,"pkcs11: C_GetAttributeValue: rv = 0x%.8X\n",rv);
+      goto endit;
+    }
+    *modulus_len =  getattributes[1].ulValueLen;
+    memcpy(modulus,(uint8 *)getattributes[1].pValue,*modulus_len);
+    *pub_exponent_len = getattributes[2].ulValueLen;
+    memcpy(pub_exponent,(uint8 *)getattributes[2].pValue,*pub_exponent_len);
+    
+    for(i=0;i<ts;i++) free(getattributes[i].pValue);
+    
+    /* all went well */
+    key->opaque = (void *)p11;
+#ifdef PKCS11_SINGLE_SESSION
+    pkcs11_logout(p11);
+#endif
+    return 0;
+
+  endit:
+    pkcs11_logout(p11);
+    if(p11->library) free(p11->library);
+    if(p11->pin) free(p11->pin);
+    if(p11->label) free(p11->label);
+    free(p11);
+    key->opaque = NULL;
+  }
+  return ret;
+}
+static int ispkcs11(const dst_key_t *key)
+{
+  RSA *rsa = key->opaque;
+  if(rsa->d && *(long *)rsa->d == PKCS11_MAGIC) return 1;
+  return 0;
+}
+static void pkcs11_free(void *cb)
+{
+  pkcs11_cb *p11;
+  p11 = (pkcs11_cb *)cb;
+  pkcs11_logout(p11);
+  free(p11);
+}
+static int pkcs11_login(pkcs11_cb *p11,char *keystr)
+{
+  int rv;
+  CK_ULONG               ulNumberOfSlots=MAX_SLOTS;
+  CK_SLOT_ID             SlotList[MAX_SLOTS];
+  CK_SESSION_HANDLE      hSessionHandle;
+
+  if(p11->sh) return 0; /* already logged in */
+
+  if(pkcs11_initlib(NULL)) return -1;
+
+  if((rv=fnclist->C_GetSlotList(TRUE,SlotList,&ulNumberOfSlots)) != CKR_OK) {
+    fprintf(stderr,"pkcs11: error: C_GetSlotList returned 0x%08x\n",rv);
+    return -1;
+  }
+  /*printf("pkcs11: Found %d slots\n",ulNumberOfSlots);*/
+  if((rv=fnclist->C_OpenSession(SlotList[p11->slot],CKF_RW_SESSION | CKF_SERIAL_SESSION,NULL,NULL,&hSessionHandle)) != CKR_OK) {
+    fprintf(stderr,"pkcs11: error: C_OpenSession returned 0x%08x\n",rv);
+    return -1;
+  } else {
+    /*fprintf(stderr,"pkcs11: C_OpenSession successfull Slot = %d\n",k);*/
+  }
+  if(p11->pin) { /* login */
+    if(strlen(p11->pin) == 0) {
+      char buf[80];
+      int i;
+
+      while(1) {
+	if(keystr) fprintf(stderr,"Please enter PIN for %s token: ",keystr); 
+	else fprintf(stderr,"Please enter PIN: ");
+	if(fgets(buf,sizeof(buf),stdin)) {
+	  buf[sizeof(buf) - 1] = '\0';
+	  i = strlen(buf) - 1;
+	  buf[i] = '\0';
+	} else {
+	  printf("PIN input error\n");
+	  fnclist->C_CloseSession(hSessionHandle);
+	  return -1;
+	}
+	if((rv=fnclist->C_Login(hSessionHandle,CKU_USER,(unsigned char *)buf,i)) != CKR_OK) {
+	  fprintf(stderr,"pkcs11: error: C_Login returned 0x%08X\n",rv);
+	} else {
+#ifdef PKCS11_SINGLE_SESSION /* security problem */
+	  free(p11->pin);
+	  p11->pin = strdup(buf); /* remember it */
+#endif
+	  break;
+	}
+      }
+    } else {
+      if((rv = fnclist->C_Login(hSessionHandle,CKU_USER,(unsigned char *)p11->pin,strlen(p11->pin))) != CKR_OK) {
+	fprintf(stderr,"pkcs11: error: C_Login returned 0x%08X\n",rv);
+	fnclist->C_CloseSession(hSessionHandle); 
+	return -1;
+      }
+    }
+  }
+  p11->sh = hSessionHandle;
+
+  /*printf("pkcs11: login slot=%d\n",p11->slot);*/
+
+  return 0;
+}
+static int pkcs11_logout(pkcs11_cb *p11)
+{
+  int rv;
+  CK_SESSION_HANDLE sh;
+
+  if(p11->magic != PKCS11_MAGIC) {
+    fprintf(stderr,"pkcs11: error: invalid control block\n");
+    return -1;
+  }
+  sh = p11->sh;
+
+  if(sh == 0) return 0; /* not open */
+
+  if(p11->pin) {
+    if((rv=fnclist->C_Logout(sh)) != CKR_OK) {
+      fprintf(stderr,"pkcs11: error: C_Logout returned 0x%08X\n",rv);
+    }
+  }
+  if((rv=fnclist->C_CloseSession(sh)) != CKR_OK) {
+    fprintf(stderr,"pkcs11: error: %s C_CloseSession returned 0x%08X\n",__func__,rv);
+  }
+
+  p11->sh = 0;
+  /*printf("pkcs11: logout slot=%d\n",p11->slot);*/
+  return 0;
+}
+static int pkcs11_RSA_sign(dst_key_t *key,unsigned char *message,unsigned int messagelen,unsigned char *sign,unsigned int *slen)
+{
+  int rv;
+  CK_MECHANISM smech;
+  CK_SESSION_HANDLE  sh;
+  pkcs11_cb *p11;
+  int ret;
+
+  ret = -1;
+
+  if(key->opaque == NULL) return ret;
+  if(((RSA *)key->opaque)->d == NULL) return ret;
+  p11 = (pkcs11_cb *)((RSA *)key->opaque)->d;
+
+#ifdef PKCS11_SINGLE_SESSION
+  if(pkcs11_login(p11,NULL)) return ret;
+#endif
+
+  sh = p11->sh;
+  /*printf("pkcs11: signing using %s/%s\n",p11->label,p11->id);*/
+
+  /*
+   * Taken directly from OPENSSL source so that their RSA_verify will
+   * accept our pkcs11 C_Sign output.
+   */
+  {
+    X509_SIG xsig;
+    ASN1_TYPE parameter;
+    int i;
+    uint8 *p,tmps[512]; /* good to 4096 bit RSA */
+    /*const unsigned char *s = NULL;*/
+    unsigned char *s;
+    X509_ALGOR algor;
+    ASN1_OCTET_STRING digest;
+
+    s = NULL;
+    xsig.algor = &algor;
+    xsig.algor->algorithm = OBJ_nid2obj(NID_sha1);
+    if(xsig.algor->algorithm == NULL) {
+      fprintf(stderr,"pkcs11: error: RSA_F_RSA_SIGN,RSA_R_UNKNOWN_ALGORITHM_TYPE\n");
+      goto err;
+    }
+    if(xsig.algor->algorithm->length == 0) {
+      fprintf(stderr,"pkcs11: error: RSA_F_RSA_SIGN,RSA_R_THE_ASN1_OBJECT_IDENTIFIER_IS_NOT_KNOWN_FOR_THIS_MD\n");
+      goto err;
+    }
+    parameter.type = V_ASN1_NULL;
+    parameter.value.ptr = NULL;
+    xsig.algor->parameter= &parameter;
+    xsig.digest = &digest;
+    xsig.digest->data = (unsigned char *)message;
+    xsig.digest->length = messagelen;
+    i = i2d_X509_SIG(&xsig,NULL);
+    if(i > (int)(sizeof(tmps) - RSA_PKCS1_PADDING_SIZE)) {
+      fprintf(stderr,"pkcs11: error: RSA_F_RSA_SIGN,RSA_R_DIGEST_TOO_BIG_FOR_RSA_KEY\n");
+      goto err;
+    }
+    p = tmps;
+    i2d_X509_SIG(&xsig,&p);
+    s = tmps;
+
+    smech.mechanism = CKM_RSA_PKCS;
+    smech.pParameter = NULL_PTR;
+    smech.ulParameterLen = 0;
+    if((rv=fnclist->C_SignInit(sh,&smech,p11->priv)) != CKR_OK) {
+      fprintf(stderr,"pkcs11: error: C_SignInit returned 0x%08X\n",rv);
+      goto err;
+    }
+    if((rv=fnclist->C_Sign(sh,(CK_BYTE_PTR)s,(CK_ULONG)i,(CK_BYTE_PTR)sign,(CK_ULONG *)slen)) != CKR_OK) {
+      fprintf(stderr,"pkcs11: error: C_Sign returned 0x%08X\n",rv);
+      goto err;
+    }
+    /*printf("Signed: %d byte signature for %d byte msg\n",*slen,i);*/
+  }
+
+  ret = 0;
+ err:
+#ifdef PKCS11_SINGLE_SESSION
+  pkcs11_logout(p11);
+#endif
+  return ret;
+}
+
+int pkcs11_initlib(char *pin)
+{
+  void *pkcs11_hLib=NULL;
+  CK_C_GetFunctionList   pGFL  = 0;
+  int rv;
+
+  /* remember command line specificed PIN number location */
+  if(pkcs11_pin == NULL && pin) {
+    pkcs11_pin = pin; 
+  }
+
+  if(fnclist) return 0;  /* already open and associated */
+
+  if(pkcs11_library == NULL || strlen(pkcs11_library) <= 0) {
+    /*
+     * if defined, then use pkcs11
+     *
+     * possible locations:
+     * "/home/dnssec/AEP/pkcs11.so.3.10",
+     * "/usr/lib/opensc-pkcs11.so",
+     * "/lib/opensc-pkcs11.so",
+     * "/usr/local/lib/opensc-pkcs11.so",
+     */
+    if((pkcs11_library=getenv("PKCS11_LIBRARY_PATH")) == NULL
+       || strlen(pkcs11_library) <= 0) {
+      /*fprintf(stderr,"You must set PKCS11_LIBRARY_PATH, e.g.,\n \"export PKCS11_LIBRARY_PATH=/usr/lib/opensc-pkcs11.so\"\n");*/
+      use_pkcs11 = 0;
+      return -1;
+    } else {
+      use_pkcs11 = 1;
+    }
+  }
+  pkcs11_hLib = dlopen(pkcs11_library,RTLD_LAZY);
+  if(!pkcs11_hLib) {
+    fprintf(stderr,"pkcs11: error: Failed to open PKCS11 library %s\n",pkcs11_library);
+    return -1;
+  }
+  if((pGFL=(CK_C_GetFunctionList)dlsym(pkcs11_hLib,"C_GetFunctionList")) == NULL) {
+    fprintf(stderr,"pkcs11: error: Cannot find GetFunctionList()\n");
+    dlclose(pkcs11_hLib);
+    return -1;
+  }
+  if((rv=pGFL(&fnclist)) != CKR_OK) {
+    fprintf(stderr,"pkcs11: error: C_GetFunctionList returned 0x%08X\n",rv);
+    dlclose(pkcs11_hLib);
+    fnclist = NULL;
+    return -1;
+  }
+  /*
+   * Note: Since we dont know what a vendor is going to do, this might
+   * clobber signal handling and other process oriented stuff. So execute
+   * this at the begining of main() before we set our own handlers.
+   */
+  if((rv=fnclist->C_Initialize(NULL)) != CKR_OK) {
+    fprintf(stderr,"pkcs11: error: C_Initialize returned 0x%08X\n",rv);
+    dlclose(pkcs11_hLib);
+    fnclist = NULL;
+    return -1;
+  }
+  return 0;
+}
+
+static int pkcs11_genkey(dst_key_t *key,unsigned char *modulus,int *modulus_len,unsigned char *pubexponent,int *pubexponent_len)
+{
+  int              rv;
+  CK_SESSION_HANDLE sh;
+  CK_ULONG         nslots=MAX_SLOTS;
+  CK_SLOT_ID       slotlist[MAX_SLOTS];
+  CK_OBJECT_HANDLE hPub,hPriv;
+  CK_OBJECT_CLASS  class_public_key = CKO_PUBLIC_KEY;
+  CK_OBJECT_CLASS  class_private_key = CKO_PRIVATE_KEY;
+  CK_KEY_TYPE      key_type = CKK_RSA;
+  CK_BBOOL         bTrue = 1;
+  CK_BBOOL         bFalse = 0;
+  CK_UTF8CHAR      Plabel8[] = "Ktemp";
+  CK_UTF8CHAR      Slabel8[] = "Ktemp";
+  CK_UTF8CHAR      Pid8[] = "F";
+  CK_UTF8CHAR      Sid8[] = "F";
+  CK_ULONG         modulusBits;
+  CK_BYTE          rsa_exponent[] = {0x01,0x00,0x01};
+  CK_MECHANISM mechanism_gen = {CKM_RSA_PKCS_KEY_PAIR_GEN,NULL_PTR,0};
+  CK_ATTRIBUTE publicKeyTemplate[] = {
+    {CKA_LABEL,Plabel8,sizeof(Plabel8)-1},
+    {CKA_ID,Pid8,sizeof(Pid8)-1}, /* arb bytes string */
+    {CKA_CLASS,&class_public_key,sizeof(class_public_key)},
+    {CKA_KEY_TYPE,&key_type,sizeof(key_type)},
+    {CKA_TOKEN,&bTrue,sizeof(CK_BBOOL)}, /* bTrue if put in HSM */
+    {CKA_ENCRYPT,&bFalse,sizeof(bTrue)}, /* bTrue */
+    {CKA_VERIFY,&bTrue,sizeof(bTrue)},
+    {CKA_EXTRACTABLE,&bTrue,sizeof(bTrue)},
+    {CKA_MODULUS_BITS,&modulusBits,sizeof(modulusBits)},
+    {CKA_PUBLIC_EXPONENT,rsa_exponent,sizeof(rsa_exponent)},
+  };
+  CK_ATTRIBUTE privateKeyTemplate[] = {
+    {CKA_LABEL,Slabel8,sizeof(Slabel8)-1},
+    {CKA_ID,Sid8,sizeof(Sid8)-1}, /* arb bytes string */
+    {CKA_CLASS,&class_private_key,sizeof(class_private_key)},
+    {CKA_KEY_TYPE,&key_type,sizeof(key_type)},
+    {CKA_TOKEN,&bTrue,sizeof(bTrue)}, /* bTrue if put in HSM */
+    {CKA_PRIVATE,&bTrue,sizeof(bTrue)},
+    {CKA_SENSITIVE,&bTrue,sizeof(bTrue)},
+    {CKA_EXTRACTABLE,&bTrue,sizeof(bTrue)},
+    {CKA_DECRYPT,&bFalse,sizeof(bTrue)}, /* bTrue */
+    {CKA_SIGN,&bTrue,sizeof(bTrue)},
+    {CKA_DERIVE,&bTrue,sizeof(bTrue)},
+  };
+  CK_ATTRIBUTE getattributes[] = {
+    {CKA_MODULUS_BITS, NULL_PTR, 0},
+    {CKA_MODULUS, NULL_PTR, 0},
+    {CKA_PUBLIC_EXPONENT, NULL_PTR, 0},
+    {CKA_ID, NULL_PTR, 0},
+    {CKA_LABEL, NULL_PTR, 0}
+  };
+  CK_ATTRIBUTE setattributes[1];
+  int ret,i,k,slot,tsize;
+  char *id,*label,buf[128];
+
+  ret = -1;
+
+  if(key->key_alg != DST_ALG_RSASHA1) {
+    fprintf(stderr,"pkcs11: error: Unsupported algorithm\n");
+    return -1;
+  }
+
+  if(pkcs11_initlib(NULL)) return -1;
+
+  modulusBits = key->key_size;
+
+  if((rv = fnclist->C_GetSlotList(TRUE,slotlist,&nslots))!=CKR_OK) {
+    fprintf(stderr,"pkcs11: error: C_GetSlotList returned 0x%08X\n",rv);
+    return ret;
+  }
+  /*printf("pkcs11: Found %d slots\n",nslots);*/
+  for(slot=0;slot<(int)nslots;slot++) {
+    if((rv=fnclist->C_OpenSession(slotlist[slot],CKF_RW_SESSION | CKF_SERIAL_SESSION,NULL,NULL,&sh)) != CKR_OK) {
+      fprintf(stderr,"pkcs11: error: C_OpenSession returned 0x%08X\n",rv);
+      continue;
+    }
+
+    /* public keys should not need a PIN so no login */
+    if(pkcs11_pin && strlen(pkcs11_pin) > 0) {
+      strcpy(buf,pkcs11_pin);
+    } else {
+      fprintf(stderr,"Enter PIN for slot %d if needed: ",slot);
+      buf[0] = '\0';
+      fgets(buf,sizeof(buf),stdin);
+      buf[strlen(buf)-1] = '\0';
+    }
+    i = strlen(buf);
+    if(i > 0) {
+      if((rv = fnclist->C_Login(sh,CKU_USER,(uint8 *)buf,i)) != CKR_OK) {
+	fprintf(stderr,"pkcs11: error: C_Login returned 0x%08X\n",rv);
+	goto enditng;
+      }
+    }
+
+    /*fprintf(stderr,"Trying to generate a %d bit key\n",(int)modulusBits);*/
+    if((rv=fnclist->C_GenerateKeyPair(sh,
+			      &mechanism_gen,
+			      publicKeyTemplate, 
+			      (sizeof(publicKeyTemplate)/sizeof(CK_ATTRIBUTE)),
+			      privateKeyTemplate, 
+			    (sizeof(privateKeyTemplate)/sizeof(CK_ATTRIBUTE)),
+				      &hPub,&hPriv)) != CKR_OK) {
+      fprintf(stderr,"pkcs11: error: Slot %d C_GenerateKeyPair returned 0x%08X\n",slot,rv);
+      fnclist->C_Logout(sh);
+      if((rv=fnclist->C_CloseSession(sh)) != CKR_OK) {
+	fprintf(stderr,"pkcs11: error: C_CloseSession returned 0x%08X\n",rv);
+      }
+      continue;
+    }
+    break;
+  }
+
+  if(slot >= (int)nslots) {
+    fprintf(stderr,"pkcs11: error: Unable to generate a new key pair.\n");
+    return ret; /* no need to close any sessions */
+  }
+
+ reeval:
+  tsize = (int)(sizeof(getattributes)/sizeof(CK_ATTRIBUTE));
+  if((rv=fnclist->C_GetAttributeValue(sh,hPub,getattributes,tsize)) != CKR_OK) {
+    fprintf(stderr,"pkcs11: error: C_GetAttributeValue returned 0x%08X\n", rv);
+    goto enditng;
+  }
+  /* Allocate memory to hold the data we want */
+  for(i=0;i<tsize;i++) { /* +1 for ASCIIZ */
+    k = (getattributes[i].ulValueLen + 1)*sizeof(CK_VOID_PTR);
+    getattributes[i].pValue = malloc(k);
+    memset(getattributes[i].pValue,0,k);
+    if(getattributes[i].pValue == NULL) {
+      for(k=0;k<i;k++) free(getattributes[k].pValue);
+      fprintf(stderr,"pkcs11: Failed to alloc memory...NULL attributes\n");
+      continue;
+    }
+  }
+  /* Call again to get actual attributes */
+  if((rv=fnclist->C_GetAttributeValue(sh,hPub,getattributes,tsize)) != CKR_OK) {
+    fprintf(stderr,"pkcs11: error: C_GetAttributeValue returned 0x%08X\n", rv);
+    goto enditng;
+  }
+  *modulus_len =  getattributes[1].ulValueLen;
+  memcpy(modulus,(uint8 *)getattributes[1].pValue,*modulus_len);
+  *pubexponent_len = getattributes[2].ulValueLen;
+  memcpy(pubexponent,(uint8 *)getattributes[2].pValue,*pubexponent_len);
+  id = cnvtid2str(getattributes[3].pValue,getattributes[3].ulValueLen);
+
+  for(i=0;i<tsize;i++) {
+    free(getattributes[i].pValue);
+    getattributes[i].pValue = NULL_PTR;
+    getattributes[i].ulValueLen = 0;
+  }
+
+  /* set label/id info for pub and priv key to tagid */
+  {
+    char tagstr[128];
+    isc_buffer_t dnsbuf;
+    unsigned char dns_array[DST_KEY_MAXSIZE];
+    isc_region_t r;
+    char namestr[512];
+    RSA *rsa;
+
+    if((rsa=RSA_new()) == NULL) {
+      fprintf(stderr,"pkcs11: error: Cannot compute tag id\n");
+      goto enditng;
+    }
+    SET_FLAGS(rsa);
+    key->opaque = rsa; /* warning: just for this operation */
+    rsa->n = BN_bin2bn(modulus,*modulus_len,NULL);
+    rsa->e = BN_bin2bn(pubexponent,*pubexponent_len,NULL);
+    isc_buffer_init(&dnsbuf,dns_array,sizeof(dns_array));
+    if(dst_key_todns(key,&dnsbuf) != ISC_R_SUCCESS) {
+      fprintf(stderr,"pkcs11: error: Cannot compute tag id\n");
+      RSA_free(rsa);
+      goto enditng;
+    }
+    isc_buffer_usedregion(&dnsbuf,&r);
+    key->key_id = dst_region_computeid(&r,key->key_alg);
+    RSA_free(rsa);
+    key->opaque = NULL;
+    dns_name_format(key->key_name,namestr,sizeof(namestr));
+
+    /*
+     * Some HSM's have limited space for labels or can only display
+     * a few characters on thier LCD displays.  So for DNSSEC keys
+     * we use the 5 digit key tag as the key label.
+     * This has a side effect of ensuring that there are no two keys
+     * in the HSM with the same computed tag, regardless of domain
+     * name or algorithm number.
+     */
+    sprintf(tagstr,"K%05d",key->key_id);
+    if(pkcs11_label_exists(sh,tagstr)) {
+      pkcs11_delete_object(sh,hPub);
+      pkcs11_delete_object(sh,hPriv);
+      fprintf(stderr,"pkcs11: %s exists. Trying to create another %d bit key..\n",tagstr,(int)modulusBits);
+      if((rv=fnclist->C_GenerateKeyPair(sh,
+		     &mechanism_gen,
+		     publicKeyTemplate,
+		     (sizeof(publicKeyTemplate)/sizeof(CK_ATTRIBUTE)),
+		     privateKeyTemplate,
+		     (sizeof(privateKeyTemplate)/sizeof(CK_ATTRIBUTE)),
+					&hPub,&hPriv)) != CKR_OK) {
+	fprintf(stderr,"pkcs11: error: Slot %d C_GenerateKeyPair returned 0x%08X\n",slot,rv);
+	goto enditng;
+      }
+      goto reeval;
+    }
+    setattributes[0].type = CKA_LABEL;
+    setattributes[0].pValue = tagstr;
+    setattributes[0].ulValueLen = strlen(tagstr);
+    if((rv=fnclist->C_SetAttributeValue(sh,hPub,setattributes,1)) != CKR_OK) {
+      fprintf(stderr,"pkcs11: error: Pub C_SetAttributeValue returned 0x%08X\n",rv);
+      goto enditng;
+    }
+    if((rv=fnclist->C_SetAttributeValue(sh,hPriv,setattributes,1)) != CKR_OK) {
+      fprintf(stderr,"pkcs11: error: Priv C_SetAttributeValue returned 0x%08X\n",rv);
+      goto enditng;
+    }
+    /*fprintf(stderr,"Internal Key Label: \"%s\"\n",tagstr);*/
+    label = strdup(tagstr);
+  }
+
+  /* all went well - store in opaque structure */
+  {
+    pkcs11_cb *p11;
+    if((p11=(pkcs11_cb *)malloc(sizeof(pkcs11_cb))) == NULL) goto enditng;
+    memset(p11,0,sizeof(pkcs11_cb));
+    p11->magic = PKCS11_MAGIC;
+    p11->slot = slot;
+    p11->id = id;
+    p11->label = label;
+    key->opaque = (void *)p11;
+  }
+
+  ret = 0;
+
+ enditng:
+  fnclist->C_Logout(sh);
+  if((rv=fnclist->C_CloseSession(sh)) != CKR_OK) {
+    fprintf(stderr,"pkcs11: error: C_CloseSession returned 0x%08X\n",rv);
+  }
+  return ret;
+}
+
+
+typedef struct {
+  int modulus_bits;
+  int modulus_len;
+  void *modulus;
+  int pubexponent_len;
+  void *pubexponent;
+  int slot;
+  char *label;
+  char *id;
+} pkcs11_key_info;
+#define MAX_PKCS11_TOKEN_ENTRIES 200
+
+static int pkcs11_getkey(dst_key_t *key,unsigned char *modulus,int *modulus_len,unsigned char *pubexponent,int *pubexponent_len)
+{
+  int i,j,k;
+  CK_SESSION_HANDLE sh;
+  int rv;
+  CK_OBJECT_CLASS pubClass = CKO_PUBLIC_KEY;
+  CK_ATTRIBUTE template[1];
+  CK_OBJECT_HANDLE hKeys[MAX_KEYS];
+  int ofound;
+  int tsize;
+  CK_ATTRIBUTE getattributes[] = {
+    {CKA_MODULUS_BITS, NULL_PTR, 0},
+    {CKA_MODULUS, NULL_PTR, 0},
+    {CKA_PUBLIC_EXPONENT, NULL_PTR, 0},
+    {CKA_ID, NULL_PTR, 0},
+    {CKA_LABEL, NULL_PTR, 0}
+  };
+  CK_ULONG               nslots=MAX_SLOTS;
+  CK_SLOT_ID             slotlist[MAX_SLOTS];
+  int slot,entry;
+  char *label,*id;
+  char buf[128];
+  char pin[128];
+  int pinlen,firstpin;
+  pkcs11_key_info *info;
+
+  if(pkcs11_initlib(NULL)) return -1;
+
+  k = MAX_PKCS11_TOKEN_ENTRIES*sizeof(pkcs11_key_info);
+  if((info=(pkcs11_key_info *)malloc(k)) == NULL) goto enditng;
+  memset(info,0,k);
+
+  firstpin = 1;
+  pinlen = 0;
+  entry = 0;
+ retry:
+  if((rv = fnclist->C_GetSlotList(TRUE,slotlist,&nslots))!=CKR_OK) {
+    fprintf(stderr,"pkcs11: C_GetSlotList failed...error no = 0x%x\n", rv);
+    goto enditok;
+  }
+  /*printf("pkcs11: Found %d slots\n",nslots);*/
+  for(i=0;i<entry;i++) { /* if retry, clear old ones */
+    if(info[i].modulus) free(info[i].modulus);
+    if(info[i].pubexponent) free(info[i].pubexponent);
+    if(info[i].label) free(info[i].label);
+    if(info[i].id) free(info[i].id);
+  }
+  entry = 0;
+
+  for(slot=0;slot<(int)nslots;slot++) {
+    /* try to find a name for the token/HSM */
+    {
+      CK_SLOT_INFO slotInfo;
+      CK_TOKEN_INFO tokenInfo;
+      char *description,*serialno,*label,*manuf;
+
+      if(fnclist->C_GetSlotInfo(slotlist[slot],&slotInfo) == CKR_OK
+	 && fnclist->C_GetTokenInfo(slotlist[slot],&tokenInfo) == CKR_OK) {
+
+	description = utf82ascii(slotInfo.slotDescription,sizeof(slotInfo.slotDescription));
+	serialno = utf82ascii(tokenInfo.serialNumber,sizeof(tokenInfo.serialNumber));
+	label = utf82ascii(tokenInfo.label,sizeof(tokenInfo.label));
+	manuf = utf82ascii(tokenInfo.manufacturerID,sizeof(tokenInfo.manufacturerID));
+	fprintf(stderr,"slot %d:%s label:%s mfr:%s S/N:%s\n",
+		slot,
+		description,
+		label,
+		manuf,
+		/*tokenInfo.model,*/
+		serialno);
+	free(description);
+	free(serialno);
+	free(label);
+	free(manuf);
+      }
+    }
+
+    if((rv=fnclist->C_OpenSession(slotlist[slot],CKF_RW_SESSION | CKF_SERIAL_SESSION,NULL,NULL,&sh)) != CKR_OK) {
+      fprintf(stderr,"pkcs11: C_OpenSession failed...error no = 0x%02x\n",rv);
+      continue;
+    }
+
+    /* public keys should not need a PIN so no login */
+    if(firstpin) {
+      if(pkcs11_pin && strlen(pkcs11_pin) > 0) {
+	strcpy(buf,pkcs11_pin);
+      } else {
+	fprintf(stderr,"Enter PIN for slot %d if needed: ",slot);
+	buf[0] = '\0';
+	fgets(buf,sizeof(buf),stdin);
+	buf[strlen(buf)-1] = '\0';
+      }
+      i = strlen(buf);
+      if(i > 0) {
+	pinlen = i;
+	strcpy(pin,buf);
+	if((rv=fnclist->C_Login(sh,CKU_USER,(uint8 *)pin,pinlen)) != CKR_OK) {
+	  fprintf(stderr,"pkcs11: C_Login failed...error no = 0x%02x\n",rv);
+	  goto endit;
+	}
+      }
+      firstpin = 0;
+    } else if(pinlen) {
+      if((rv=fnclist->C_Login(sh,CKU_USER,(uint8 *)pin,pinlen)) != CKR_OK) {
+	fprintf(stderr,"pkcs11: C_Login failed...error no = 0x%02x\n",rv);
+	goto endit;
+      }
+    }
+
+    template[0].type = CKA_CLASS;
+    template[0].pValue = &pubClass;
+    template[0].ulValueLen = sizeof(pubClass);
+    rv = fnclist->C_FindObjectsInit(sh,template,1);
+    if(rv != CKR_OK) goto endit;
+    rv = fnclist->C_FindObjects(sh,hKeys,MAX_KEYS,(CK_RV *)&ofound);
+    if(rv != CKR_OK) goto endit;
+    rv = fnclist->C_FindObjectsFinal(sh);
+    if(rv != CKR_OK) goto endit;
+    if(ofound <= 0) {
+      fprintf(stderr,"pkcs11: No public keys found in slot %d\n",slot);/**/
+      goto endit;
+    }
+    /*printf("pkcs11: Found %d public keys in slot %d\n",ofound,slot);*/
+    tsize = (int)(sizeof(getattributes)/sizeof(CK_ATTRIBUTE));
+    for(i=0;i<ofound;i++) {
+      for(j=0;j<tsize;j++) {
+	getattributes[j].pValue = NULL_PTR;
+	getattributes[j].ulValueLen = 0;
+      }
+      rv = fnclist->C_GetAttributeValue(sh,hKeys[i],getattributes,tsize);
+      if(rv != CKR_OK) {
+	fprintf(stderr,"pkcs11: C_GetAttributeValue: rv = 0x%.8X\n", rv);
+	continue;
+      }
+      /* Allocate memory to hold the data we want */
+      for(j=0;j<tsize;j++) { /* +1 for ASCIIZ */
+	k = (getattributes[j].ulValueLen + 1)*sizeof(CK_VOID_PTR);
+	getattributes[j].pValue = malloc(k);
+	memset(getattributes[j].pValue,0,k);
+	if(getattributes[j].pValue == NULL) {
+	  for(k=0;k<j;k++) free(getattributes[k].pValue);
+	  fprintf(stderr,"pkcs11: Failed to alloc memory...NULL attributes\n");
+	  continue;
+	}
+      }
+      /* Call again to get actual attributes */
+      if((rv=fnclist->C_GetAttributeValue(sh,hKeys[i],getattributes,tsize)) != CKR_OK) {
+	fprintf(stderr,"pkcs11: C_GetAttributeValue: rv = 0x%.8X\n",rv);
+	continue;
+      }
+
+      /* BITS */
+      k = *((CK_ULONG_PTR)(getattributes[0].pValue));
+      free(getattributes[0].pValue);
+      getattributes[0].pValue = NULL_PTR;
+      getattributes[0].ulValueLen = 0;
+      info[entry].modulus_bits = k;
+
+      info[entry].modulus_len =  getattributes[1].ulValueLen;
+      info[entry].modulus = (uint8 *)getattributes[1].pValue;
+
+      info[entry].pubexponent_len = getattributes[2].ulValueLen;
+      info[entry].pubexponent = (uint8 *)getattributes[2].pValue;
+
+      info[entry].id = cnvtid2str(getattributes[3].pValue,getattributes[3].ulValueLen);
+      free(getattributes[3].pValue);
+
+      info[entry].slot = slot;
+
+      info[entry].label = cnvtlabel2str(getattributes[4].pValue,getattributes[4].ulValueLen);
+      free(getattributes[4].pValue);
+
+      fprintf(stderr,"\t%d) \"%s\" SLOT:%d ID:%s BITS:%d\n",entry+1,info[entry].label,slot,info[entry].id,k);
+
+      entry++;
+      if(entry >= MAX_PKCS11_TOKEN_ENTRIES) break;
+    }
+  endit:
+    if(pinlen) fnclist->C_Logout(sh);
+    if((rv=fnclist->C_CloseSession(sh)) != CKR_OK) {
+      fprintf(stderr,"pkcs11: %s C_CloseSession failed error = 0x%04x\n",__func__,rv);
+    }
+  }
+
+  if(entry == 0) {
+    fprintf(stderr,"No keys found. Make sure crypto device is enabled.\n");
+    goto enditng;
+  }
+
+  fprintf(stderr,"Select one: ");
+  if(fgets(buf,sizeof(buf),stdin)) {
+    buf[strlen(buf)-1] = '\0';
+    i = atoi(buf);
+    if(i <= 0 || i > entry) goto retry;
+    fprintf(stderr,"You chose key %d\n",i);
+    i--;
+    *modulus_len =  info[i].modulus_len;
+    memcpy(modulus,info[i].modulus,*modulus_len);
+    *pubexponent_len = info[i].pubexponent_len;
+    memcpy(pubexponent,info[i].pubexponent,*pubexponent_len);
+    /*pkcs11_display_pubval(modulus,*modulus_len,pubexponent,*pubexponent_len);*/
+    slot = info[i].slot;
+    id = strdup(info[i].id);
+    label = strdup(info[i].label);
+
+    /*pkcs11_test_keypair_name(slot,label,id);*/
+
+    for(i=0;i<entry;i++) {
+      if(info[i].modulus) free(info[i].modulus);
+      if(info[i].pubexponent) free(info[i].pubexponent);
+      if(info[i].label) free(info[i].label);
+      if(info[i].id) free(info[i].id);
+    }
+    /* no need to zero array since we drop through */
+  } else {
+    goto retry;
+  }
+
+  /* all went well */
+  {
+    pkcs11_cb *p11;
+    if((p11=(pkcs11_cb *)malloc(sizeof(pkcs11_cb))) == NULL) goto enditng;
+    memset(p11,0,sizeof(pkcs11_cb));
+    p11->magic = PKCS11_MAGIC;
+    p11->slot = slot;
+    p11->id = id;
+    p11->label = label;
+    key->opaque = (void *)p11;
+  }
+
+ enditok:
+  if(info) free(info);
+  return 0;
+ enditng:
+  if(info) free(info);
+  return -1;
+}
+static int pkcs11_writeparams(const dst_key_t *key,char *fname)
+{
+  FILE *fp;
+  pkcs11_cb *p11;
+
+  if(key->opaque == NULL) return -1;
+  if(((RSA *)key->opaque)->d == NULL) return -1;
+  p11 = (pkcs11_cb *)((RSA *)key->opaque)->d;
+  if((fp=fopen(fname,"w")) == NULL) return -1;
+  /* 
+   * Note: empty "pin:" line forces a PIN to be requested
+   * from the operator.  Manually remove line from file
+   * if key requires no PIN.
+   * Alternatively, manually add pin to line, e.g., "pin:123456",
+   * if your security practices find this reasonable.
+   */
+  fprintf(fp,"Private-key-format: xxx\nslot:%d\npin:\n",p11->slot);
+  if(p11->label) fprintf(fp,"id:%s\n",p11->id);
+  if(p11->label) fprintf(fp,"label:%s\n",p11->label);
+  fclose(fp);
+  /*printf("pkcs11: Wrote token parameters to %s\n",fname);*/
+  return 0;
+}
+static int pkcs11_label_exists(CK_SESSION_HANDLE sh,char *label)
+{
+  int ofound,rv;
+  CK_ATTRIBUTE template[2];
+  CK_OBJECT_CLASS pubClass = CKO_PUBLIC_KEY;
+  CK_OBJECT_HANDLE hKeys[MAX_KEYS];
+
+  if(label == NULL || strlen(label) <= 0) return 0;
+
+  template[0].type = CKA_CLASS;
+  template[0].pValue = &pubClass;
+  template[0].ulValueLen = sizeof(pubClass);
+  template[1].type = CKA_LABEL;
+  template[1].pValue = label;
+  template[1].ulValueLen = strlen(label);
+
+  rv = fnclist->C_FindObjectsInit(sh,template,2);
+  if(rv != CKR_OK) return 0;
+  rv = fnclist->C_FindObjects(sh,hKeys,MAX_KEYS,(CK_RV *)&ofound);
+  if(rv != CKR_OK) return 0;
+  rv = fnclist->C_FindObjectsFinal(sh);
+  if(rv != CKR_OK) return 0;
+  if(ofound <= 0) return 0;
+  return 1;
+}
+static int pkcs11_delete_object(CK_SESSION_HANDLE sh,CK_OBJECT_HANDLE hObj)
+{
+  int rv;
+  if((rv=fnclist->C_DestroyObject(sh,hObj)) != CKR_OK) {
+    fprintf(stderr,"pkcs11: C_DestroyObject failed err=%08X\n",rv);
+    return -1;
+  }
+  /*printf("pkcs11: Deleted object %08x\n",hObj);*/
+  return 0;
+}
+static char *cnvtid2str(uint8 *p,int len)
+{
+  char *q;
+  int i;
+  q = (char *)malloc((2*len) + 1);
+  q[0] = '\0';
+  for(i=0;i<len;i++) {
+    sprintf(&q[strlen(q)],"%02x",p[i]);
+  }
+  return q;
+}
+static char *cnvtlabel2str(uint8 *p,int len)
+{
+  char *q;
+  q = (char *)malloc(len + 1);
+  memcpy(q,p,len);
+  q[len] = '\0';
+  return q;
+}
+static char *utf82ascii(uint8 *p,int n)
+{
+  char *q,*r,*r0;
+  int i,un;
+
+  un = 0;
+  r0 = r = (char *)malloc(n + 1);
+  for(q=(char *)p,i=0;i<n;q++,i++) {
+    if( ((*q)&0x80) == 0x80 ) {
+      if(un == 0) {
+	*r++ = '-';
+	un = 1;
+      } else {
+      }
+    } else {
+      *r++ = *q;
+      un = 0;
+    }
+  }
+  *r = '\0';
+
+  for(q=r0+strlen(r0)-1;q != r0;q--) {
+    if(*q != ' ' && *q != '\t') break;
+  }
+  *(q+1) = '\0';
+  return r0;
+}
+static int hex2i(char c)
+{
+  if(c >= '0' && c <= '9') return (int)(c - '0');
+  if(c >= 'A' && c <= 'F') return (int)((c - 'A') + 10);
+  return -1;
+}
diff -Nur bind-9.4.1-P1/lib/dns/pkcs11f.h bind-9.4.1-P1.pkcs11/lib/dns/pkcs11f.h
--- bind-9.4.1-P1/lib/dns/pkcs11f.h	1969-12-31 16:00:00.000000000 -0800
+++ bind-9.4.1-P1.pkcs11/lib/dns/pkcs11f.h	2007-08-06 17:03:44.000000000 -0700
@@ -0,0 +1,912 @@
+/* pkcs11f.h include file for PKCS #11. */
+/* $Revision: 1.4 $ */
+
+/* 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 header file contains pretty much everything about all the */
+/* Cryptoki function prototypes.  Because this information is */
+/* used for more than just declaring function prototypes, the */
+/* order of the functions appearing herein is important, and */
+/* should not be altered. */
+
+/* General-purpose */
+
+/* C_Initialize initializes the Cryptoki library. */
+CK_PKCS11_FUNCTION_INFO(C_Initialize)
+#ifdef CK_NEED_ARG_LIST
+  (
+  CK_VOID_PTR   pInitArgs  /* if this is not NULL_PTR, it gets
+                            * cast to CK_C_INITIALIZE_ARGS_PTR
+                            * and dereferenced */
+  );
+#endif
+
+
+/* C_Finalize indicates that an application is done with the
+ * Cryptoki library. */
+CK_PKCS11_FUNCTION_INFO(C_Finalize)
+#ifdef CK_NEED_ARG_LIST
+  (
+   CK_VOID_PTR   pReserved  /* reserved.  Should be NULL_PTR */
+   );
+#endif
+
+
+/* C_GetInfo returns general information about Cryptoki. */
+CK_PKCS11_FUNCTION_INFO(C_GetInfo)
+#ifdef CK_NEED_ARG_LIST
+  (
+   CK_INFO_PTR   pInfo  /* location that receives information */
+   );
+#endif
+
+
+/* C_GetFunctionList returns the function list. */
+CK_PKCS11_FUNCTION_INFO(C_GetFunctionList)
+#ifdef CK_NEED_ARG_LIST
+  (
+  CK_FUNCTION_LIST_PTR_PTR ppFunctionList  /* receives pointer to
+                                            * function list */
+  );
+#endif
+
+
+
+/* Slot and token management */
+
+/* C_GetSlotList obtains a list of slots in the system. */
+CK_PKCS11_FUNCTION_INFO(C_GetSlotList)
+#ifdef CK_NEED_ARG_LIST
+  (
+   CK_BBOOL       tokenPresent,  /* only slots with tokens? */
+   CK_SLOT_ID_PTR pSlotList,     /* receives array of slot IDs */
+   CK_ULONG_PTR   pulCount       /* receives number of slots */
+   );
+#endif
+
+
+/* C_GetSlotInfo obtains information about a particular slot in
+ * the system. */
+CK_PKCS11_FUNCTION_INFO(C_GetSlotInfo)
+#ifdef CK_NEED_ARG_LIST
+  (
+   CK_SLOT_ID       slotID,  /* the ID of the slot */
+   CK_SLOT_INFO_PTR pInfo    /* receives the slot information */
+   );
+#endif
+
+
+/* C_GetTokenInfo obtains information about a particular token
+ * in the system. */
+CK_PKCS11_FUNCTION_INFO(C_GetTokenInfo)
+#ifdef CK_NEED_ARG_LIST
+  (
+   CK_SLOT_ID        slotID,  /* ID of the token's slot */
+   CK_TOKEN_INFO_PTR pInfo    /* receives the token information */
+   );
+#endif
+
+
+/* C_GetMechanismList obtains a list of mechanism types
+ * supported by a token. */
+CK_PKCS11_FUNCTION_INFO(C_GetMechanismList)
+#ifdef CK_NEED_ARG_LIST
+  (
+   CK_SLOT_ID            slotID,          /* ID of token's slot */
+   CK_MECHANISM_TYPE_PTR pMechanismList,  /* gets mech. array */
+   CK_ULONG_PTR          pulCount         /* gets # of mechs. */
+   );
+#endif
+
+
+/* C_GetMechanismInfo obtains information about a particular
+ * mechanism possibly supported by a token. */
+CK_PKCS11_FUNCTION_INFO(C_GetMechanismInfo)
+#ifdef CK_NEED_ARG_LIST
+  (
+   CK_SLOT_ID            slotID,  /* ID of the token's slot */
+   CK_MECHANISM_TYPE     type,    /* type of mechanism */
+   CK_MECHANISM_INFO_PTR pInfo    /* receives mechanism info */
+   );
+#endif
+
+
+/* C_InitToken initializes a token. */
+CK_PKCS11_FUNCTION_INFO(C_InitToken)
+#ifdef CK_NEED_ARG_LIST
+/* pLabel changed from CK_CHAR_PTR to CK_UTF8CHAR_PTR for v2.10 */
+  (
+   CK_SLOT_ID      slotID,    /* ID of the token's slot */
+   CK_UTF8CHAR_PTR pPin,      /* the SO's initial PIN */
+   CK_ULONG        ulPinLen,  /* length in bytes of the PIN */
+   CK_UTF8CHAR_PTR pLabel     /* 32-byte token label (blank padded) */
+   );
+#endif
+
+
+/* C_InitPIN initializes the normal user's PIN. */
+CK_PKCS11_FUNCTION_INFO(C_InitPIN)
+#ifdef CK_NEED_ARG_LIST
+  (
+   CK_SESSION_HANDLE hSession,  /* the session's handle */
+   CK_UTF8CHAR_PTR   pPin,      /* the normal user's PIN */
+   CK_ULONG          ulPinLen   /* length in bytes of the PIN */
+   );
+#endif
+
+
+/* C_SetPIN modifies the PIN of the user who is logged in. */
+CK_PKCS11_FUNCTION_INFO(C_SetPIN)
+#ifdef CK_NEED_ARG_LIST
+  (
+   CK_SESSION_HANDLE hSession,  /* the session's handle */
+   CK_UTF8CHAR_PTR   pOldPin,   /* the old PIN */
+   CK_ULONG          ulOldLen,  /* length of the old PIN */
+   CK_UTF8CHAR_PTR   pNewPin,   /* the new PIN */
+   CK_ULONG          ulNewLen   /* length of the new PIN */
+   );
+#endif
+
+
+
+/* Session management */
+
+/* C_OpenSession opens a session between an application and a
+ * token. */
+CK_PKCS11_FUNCTION_INFO(C_OpenSession)
+#ifdef CK_NEED_ARG_LIST
+  (
+   CK_SLOT_ID            slotID,        /* the slot's ID */
+   CK_FLAGS              flags,         /* from CK_SESSION_INFO */
+   CK_VOID_PTR           pApplication,  /* passed to callback */
+   CK_NOTIFY             Notify,        /* callback function */
+   CK_SESSION_HANDLE_PTR phSession      /* gets session handle */
+   );
+#endif
+
+
+/* C_CloseSession closes a session between an application and a
+ * token. */
+CK_PKCS11_FUNCTION_INFO(C_CloseSession)
+#ifdef CK_NEED_ARG_LIST
+  (
+   CK_SESSION_HANDLE hSession  /* the session's handle */
+   );
+#endif
+
+
+/* C_CloseAllSessions closes all sessions with a token. */
+CK_PKCS11_FUNCTION_INFO(C_CloseAllSessions)
+#ifdef CK_NEED_ARG_LIST
+  (
+   CK_SLOT_ID     slotID  /* the token's slot */
+   );
+#endif
+
+
+/* C_GetSessionInfo obtains information about the session. */
+CK_PKCS11_FUNCTION_INFO(C_GetSessionInfo)
+#ifdef CK_NEED_ARG_LIST
+  (
+   CK_SESSION_HANDLE   hSession,  /* the session's handle */
+   CK_SESSION_INFO_PTR pInfo      /* receives session info */
+   );
+#endif
+
+
+/* C_GetOperationState obtains the state of the cryptographic operation
+ * in a session. */
+CK_PKCS11_FUNCTION_INFO(C_GetOperationState)
+#ifdef CK_NEED_ARG_LIST
+  (
+   CK_SESSION_HANDLE hSession,             /* session's handle */
+   CK_BYTE_PTR       pOperationState,      /* gets state */
+   CK_ULONG_PTR      pulOperationStateLen  /* gets state length */
+   );
+#endif
+
+
+/* C_SetOperationState restores the state of the cryptographic
+ * operation in a session. */
+CK_PKCS11_FUNCTION_INFO(C_SetOperationState)
+#ifdef CK_NEED_ARG_LIST
+  (
+   CK_SESSION_HANDLE hSession,            /* session's handle */
+   CK_BYTE_PTR      pOperationState,      /* holds state */
+   CK_ULONG         ulOperationStateLen,  /* holds state length */
+   CK_OBJECT_HANDLE hEncryptionKey,       /* en/decryption key */
+   CK_OBJECT_HANDLE hAuthenticationKey    /* sign/verify key */
+   );
+#endif
+
+
+/* C_Login logs a user into a token. */
+CK_PKCS11_FUNCTION_INFO(C_Login)
+#ifdef CK_NEED_ARG_LIST
+  (
+   CK_SESSION_HANDLE hSession,  /* the session's handle */
+   CK_USER_TYPE      userType,  /* the user type */
+   CK_UTF8CHAR_PTR   pPin,      /* the user's PIN */
+   CK_ULONG          ulPinLen   /* the length of the PIN */
+   );
+#endif
+
+
+/* C_Logout logs a user out from a token. */
+CK_PKCS11_FUNCTION_INFO(C_Logout)
+#ifdef CK_NEED_ARG_LIST
+  (
+   CK_SESSION_HANDLE hSession  /* the session's handle */
+   );
+#endif
+
+
+
+/* Object management */
+
+/* C_CreateObject creates a new object. */
+CK_PKCS11_FUNCTION_INFO(C_CreateObject)
+#ifdef CK_NEED_ARG_LIST
+  (
+   CK_SESSION_HANDLE hSession,    /* the session's handle */
+   CK_ATTRIBUTE_PTR  pTemplate,   /* the object's template */
+   CK_ULONG          ulCount,     /* attributes in template */
+   CK_OBJECT_HANDLE_PTR phObject  /* gets new object's handle. */
+   );
+#endif
+
+
+/* C_CopyObject copies an object, creating a new object for the
+ * copy. */
+CK_PKCS11_FUNCTION_INFO(C_CopyObject)
+#ifdef CK_NEED_ARG_LIST
+  (
+   CK_SESSION_HANDLE    hSession,    /* the session's handle */
+   CK_OBJECT_HANDLE     hObject,     /* the object's handle */
+   CK_ATTRIBUTE_PTR     pTemplate,   /* template for new object */
+   CK_ULONG             ulCount,     /* attributes in template */
+   CK_OBJECT_HANDLE_PTR phNewObject  /* receives handle of copy */
+   );
+#endif
+
+
+/* C_DestroyObject destroys an object. */
+CK_PKCS11_FUNCTION_INFO(C_DestroyObject)
+#ifdef CK_NEED_ARG_LIST
+  (
+   CK_SESSION_HANDLE hSession,  /* the session's handle */
+   CK_OBJECT_HANDLE  hObject    /* the object's handle */
+   );
+#endif
+
+
+/* C_GetObjectSize gets the size of an object in bytes. */
+CK_PKCS11_FUNCTION_INFO(C_GetObjectSize)
+#ifdef CK_NEED_ARG_LIST
+  (
+   CK_SESSION_HANDLE hSession,  /* the session's handle */
+   CK_OBJECT_HANDLE  hObject,   /* the object's handle */
+   CK_ULONG_PTR      pulSize    /* receives size of object */
+   );
+#endif
+
+
+/* C_GetAttributeValue obtains the value of one or more object
+ * attributes. */
+CK_PKCS11_FUNCTION_INFO(C_GetAttributeValue)
+#ifdef CK_NEED_ARG_LIST
+  (
+   CK_SESSION_HANDLE hSession,   /* the session's handle */
+   CK_OBJECT_HANDLE  hObject,    /* the object's handle */
+   CK_ATTRIBUTE_PTR  pTemplate,  /* specifies attrs; gets vals */
+   CK_ULONG          ulCount     /* attributes in template */
+   );
+#endif
+
+
+/* C_SetAttributeValue modifies the value of one or more object
+ * attributes */
+CK_PKCS11_FUNCTION_INFO(C_SetAttributeValue)
+#ifdef CK_NEED_ARG_LIST
+  (
+   CK_SESSION_HANDLE hSession,   /* the session's handle */
+   CK_OBJECT_HANDLE  hObject,    /* the object's handle */
+   CK_ATTRIBUTE_PTR  pTemplate,  /* specifies attrs and values */
+   CK_ULONG          ulCount     /* attributes in template */
+   );
+#endif
+
+
+/* C_FindObjectsInit initializes a search for token and session
+ * objects that match a template. */
+CK_PKCS11_FUNCTION_INFO(C_FindObjectsInit)
+#ifdef CK_NEED_ARG_LIST
+  (
+   CK_SESSION_HANDLE hSession,   /* the session's handle */
+   CK_ATTRIBUTE_PTR  pTemplate,  /* attribute values to match */
+   CK_ULONG          ulCount     /* attrs in search template */
+   );
+#endif
+
+
+/* C_FindObjects continues a search for token and session
+ * objects that match a template, obtaining additional object
+ * handles. */
+CK_PKCS11_FUNCTION_INFO(C_FindObjects)
+#ifdef CK_NEED_ARG_LIST
+  (
+   CK_SESSION_HANDLE    hSession,          /* session's handle */
+   CK_OBJECT_HANDLE_PTR phObject,          /* gets obj. handles */
+   CK_ULONG             ulMaxObjectCount,  /* max handles to get */
+   CK_ULONG_PTR         pulObjectCount     /* actual # returned */
+   );
+#endif
+
+
+/* C_FindObjectsFinal finishes a search for token and session
+ * objects. */
+CK_PKCS11_FUNCTION_INFO(C_FindObjectsFinal)
+#ifdef CK_NEED_ARG_LIST
+  (
+   CK_SESSION_HANDLE hSession  /* the session's handle */
+   );
+#endif
+
+
+
+/* Encryption and decryption */
+
+/* C_EncryptInit initializes an encryption operation. */
+CK_PKCS11_FUNCTION_INFO(C_EncryptInit)
+#ifdef CK_NEED_ARG_LIST
+  (
+   CK_SESSION_HANDLE hSession,    /* the session's handle */
+   CK_MECHANISM_PTR  pMechanism,  /* the encryption mechanism */
+   CK_OBJECT_HANDLE  hKey         /* handle of encryption key */
+   );
+#endif
+
+
+/* C_Encrypt encrypts single-part data. */
+CK_PKCS11_FUNCTION_INFO(C_Encrypt)
+#ifdef CK_NEED_ARG_LIST
+  (
+   CK_SESSION_HANDLE hSession,            /* session's handle */
+   CK_BYTE_PTR       pData,               /* the plaintext data */
+   CK_ULONG          ulDataLen,           /* bytes of plaintext */
+   CK_BYTE_PTR       pEncryptedData,      /* gets ciphertext */
+   CK_ULONG_PTR      pulEncryptedDataLen  /* gets c-text size */
+   );
+#endif
+
+
+/* C_EncryptUpdate continues a multiple-part encryption
+ * operation. */
+CK_PKCS11_FUNCTION_INFO(C_EncryptUpdate)
+#ifdef CK_NEED_ARG_LIST
+  (
+   CK_SESSION_HANDLE hSession,           /* session's handle */
+   CK_BYTE_PTR       pPart,              /* the plaintext data */
+   CK_ULONG          ulPartLen,          /* plaintext data len */
+   CK_BYTE_PTR       pEncryptedPart,     /* gets ciphertext */
+   CK_ULONG_PTR      pulEncryptedPartLen /* gets c-text size */
+   );
+#endif
+
+
+/* C_EncryptFinal finishes a multiple-part encryption
+ * operation. */
+CK_PKCS11_FUNCTION_INFO(C_EncryptFinal)
+#ifdef CK_NEED_ARG_LIST
+  (
+   CK_SESSION_HANDLE hSession,                /* session handle */
+   CK_BYTE_PTR       pLastEncryptedPart,      /* last c-text */
+   CK_ULONG_PTR      pulLastEncryptedPartLen  /* gets last size */
+   );
+#endif
+
+
+/* C_DecryptInit initializes a decryption operation. */
+CK_PKCS11_FUNCTION_INFO(C_DecryptInit)
+#ifdef CK_NEED_ARG_LIST
+  (
+   CK_SESSION_HANDLE hSession,    /* the session's handle */
+   CK_MECHANISM_PTR  pMechanism,  /* the decryption mechanism */
+   CK_OBJECT_HANDLE  hKey         /* handle of decryption key */
+   );
+#endif
+
+
+/* C_Decrypt decrypts encrypted data in a single part. */
+CK_PKCS11_FUNCTION_INFO(C_Decrypt)
+#ifdef CK_NEED_ARG_LIST
+  (
+   CK_SESSION_HANDLE hSession,           /* session's handle */
+   CK_BYTE_PTR       pEncryptedData,     /* ciphertext */
+   CK_ULONG          ulEncryptedDataLen, /* ciphertext length */
+   CK_BYTE_PTR       pData,              /* gets plaintext */
+   CK_ULONG_PTR      pulDataLen          /* gets p-text size */
+   );
+#endif
+
+
+/* C_DecryptUpdate continues a multiple-part decryption
+ * operation. */
+CK_PKCS11_FUNCTION_INFO(C_DecryptUpdate)
+#ifdef CK_NEED_ARG_LIST
+  (
+   CK_SESSION_HANDLE hSession,            /* session's handle */
+   CK_BYTE_PTR       pEncryptedPart,      /* encrypted data */
+   CK_ULONG          ulEncryptedPartLen,  /* input length */
+   CK_BYTE_PTR       pPart,               /* gets plaintext */
+   CK_ULONG_PTR      pulPartLen           /* p-text size */
+   );
+#endif
+
+
+/* C_DecryptFinal finishes a multiple-part decryption
+ * operation. */
+CK_PKCS11_FUNCTION_INFO(C_DecryptFinal)
+#ifdef CK_NEED_ARG_LIST
+  (
+   CK_SESSION_HANDLE hSession,       /* the session's handle */
+   CK_BYTE_PTR       pLastPart,      /* gets plaintext */
+   CK_ULONG_PTR      pulLastPartLen  /* p-text size */
+   );
+#endif
+
+
+
+/* Message digesting */
+
+/* C_DigestInit initializes a message-digesting operation. */
+CK_PKCS11_FUNCTION_INFO(C_DigestInit)
+#ifdef CK_NEED_ARG_LIST
+  (
+   CK_SESSION_HANDLE hSession,   /* the session's handle */
+   CK_MECHANISM_PTR  pMechanism  /* the digesting mechanism */
+   );
+#endif
+
+
+/* C_Digest digests data in a single part. */
+CK_PKCS11_FUNCTION_INFO(C_Digest)
+#ifdef CK_NEED_ARG_LIST
+  (
+   CK_SESSION_HANDLE hSession,     /* the session's handle */
+   CK_BYTE_PTR       pData,        /* data to be digested */
+   CK_ULONG          ulDataLen,    /* bytes of data to digest */
+   CK_BYTE_PTR       pDigest,      /* gets the message digest */
+   CK_ULONG_PTR      pulDigestLen  /* gets digest length */
+   );
+#endif
+
+
+/* C_DigestUpdate continues a multiple-part message-digesting
+ * operation. */
+CK_PKCS11_FUNCTION_INFO(C_DigestUpdate)
+#ifdef CK_NEED_ARG_LIST
+  (
+   CK_SESSION_HANDLE hSession,  /* the session's handle */
+   CK_BYTE_PTR       pPart,     /* data to be digested */
+   CK_ULONG          ulPartLen  /* bytes of data to be digested */
+   );
+#endif
+
+
+/* C_DigestKey continues a multi-part message-digesting
+ * operation, by digesting the value of a secret key as part of
+ * the data already digested. */
+CK_PKCS11_FUNCTION_INFO(C_DigestKey)
+#ifdef CK_NEED_ARG_LIST
+  (
+   CK_SESSION_HANDLE hSession,  /* the session's handle */
+   CK_OBJECT_HANDLE  hKey       /* secret key to digest */
+   );
+#endif
+
+
+/* C_DigestFinal finishes a multiple-part message-digesting
+ * operation. */
+CK_PKCS11_FUNCTION_INFO(C_DigestFinal)
+#ifdef CK_NEED_ARG_LIST
+  (
+   CK_SESSION_HANDLE hSession,     /* the session's handle */
+   CK_BYTE_PTR       pDigest,      /* gets the message digest */
+   CK_ULONG_PTR      pulDigestLen  /* gets byte count of digest */
+   );
+#endif
+
+
+
+/* Signing and MACing */
+
+/* C_SignInit initializes a signature (private key encryption)
+ * operation, where the signature is (will be) an appendix to
+ * the data, and plaintext cannot be recovered from the
+ *signature. */
+CK_PKCS11_FUNCTION_INFO(C_SignInit)
+#ifdef CK_NEED_ARG_LIST
+  (
+   CK_SESSION_HANDLE hSession,    /* the session's handle */
+   CK_MECHANISM_PTR  pMechanism,  /* the signature mechanism */
+   CK_OBJECT_HANDLE  hKey         /* handle of signature key */
+   );
+#endif
+
+
+/* C_Sign signs (encrypts with private key) data in a single
+ * part, where the signature is (will be) an appendix to the
+ * data, and plaintext cannot be recovered from the signature. */
+CK_PKCS11_FUNCTION_INFO(C_Sign)
+#ifdef CK_NEED_ARG_LIST
+  (
+   CK_SESSION_HANDLE hSession,        /* the session's handle */
+   CK_BYTE_PTR       pData,           /* the data to sign */
+   CK_ULONG          ulDataLen,       /* count of bytes to sign */
+   CK_BYTE_PTR       pSignature,      /* gets the signature */
+   CK_ULONG_PTR      pulSignatureLen  /* gets signature length */
+   );
+#endif
+
+
+/* C_SignUpdate continues a multiple-part signature operation,
+ * where the signature is (will be) an appendix to the data, 
+ * and plaintext cannot be recovered from the signature. */
+CK_PKCS11_FUNCTION_INFO(C_SignUpdate)
+#ifdef CK_NEED_ARG_LIST
+  (
+   CK_SESSION_HANDLE hSession,  /* the session's handle */
+   CK_BYTE_PTR       pPart,     /* the data to sign */
+   CK_ULONG          ulPartLen  /* count of bytes to sign */
+   );
+#endif
+
+
+/* C_SignFinal finishes a multiple-part signature operation, 
+ * returning the signature. */
+CK_PKCS11_FUNCTION_INFO(C_SignFinal)
+#ifdef CK_NEED_ARG_LIST
+  (
+   CK_SESSION_HANDLE hSession,        /* the session's handle */
+   CK_BYTE_PTR       pSignature,      /* gets the signature */
+   CK_ULONG_PTR      pulSignatureLen  /* gets signature length */
+   );
+#endif
+
+
+/* C_SignRecoverInit initializes a signature operation, where
+ * the data can be recovered from the signature. */
+CK_PKCS11_FUNCTION_INFO(C_SignRecoverInit)
+#ifdef CK_NEED_ARG_LIST
+  (
+   CK_SESSION_HANDLE hSession,   /* the session's handle */
+   CK_MECHANISM_PTR  pMechanism, /* the signature mechanism */
+   CK_OBJECT_HANDLE  hKey        /* handle of the signature key */
+   );
+#endif
+
+
+/* C_SignRecover signs data in a single operation, where the
+ * data can be recovered from the signature. */
+CK_PKCS11_FUNCTION_INFO(C_SignRecover)
+#ifdef CK_NEED_ARG_LIST
+  (
+   CK_SESSION_HANDLE hSession,        /* the session's handle */
+   CK_BYTE_PTR       pData,           /* the data to sign */
+   CK_ULONG          ulDataLen,       /* count of bytes to sign */
+   CK_BYTE_PTR       pSignature,      /* gets the signature */
+   CK_ULONG_PTR      pulSignatureLen  /* gets signature length */
+   );
+#endif
+
+
+
+/* Verifying signatures and MACs */
+
+/* C_VerifyInit initializes a verification operation, where the
+ * signature is an appendix to the data, and plaintext cannot
+ *  cannot be recovered from the signature (e.g. DSA). */
+CK_PKCS11_FUNCTION_INFO(C_VerifyInit)
+#ifdef CK_NEED_ARG_LIST
+  (
+   CK_SESSION_HANDLE hSession,    /* the session's handle */
+   CK_MECHANISM_PTR  pMechanism,  /* the verification mechanism */
+   CK_OBJECT_HANDLE  hKey         /* verification key */ 
+   );
+#endif
+
+
+/* C_Verify verifies a signature in a single-part operation, 
+ * where the signature is an appendix to the data, and plaintext
+ * cannot be recovered from the signature. */
+CK_PKCS11_FUNCTION_INFO(C_Verify)
+#ifdef CK_NEED_ARG_LIST
+  (
+   CK_SESSION_HANDLE hSession,       /* the session's handle */
+   CK_BYTE_PTR       pData,          /* signed data */
+   CK_ULONG          ulDataLen,      /* length of signed data */
+   CK_BYTE_PTR       pSignature,     /* signature */
+   CK_ULONG          ulSignatureLen  /* signature length*/
+   );
+#endif
+
+
+/* C_VerifyUpdate continues a multiple-part verification
+ * operation, where the signature is an appendix to the data, 
+ * and plaintext cannot be recovered from the signature. */
+CK_PKCS11_FUNCTION_INFO(C_VerifyUpdate)
+#ifdef CK_NEED_ARG_LIST
+  (
+   CK_SESSION_HANDLE hSession,  /* the session's handle */
+   CK_BYTE_PTR       pPart,     /* signed data */
+   CK_ULONG          ulPartLen  /* length of signed data */
+   );
+#endif
+
+
+/* C_VerifyFinal finishes a multiple-part verification
+ * operation, checking the signature. */
+CK_PKCS11_FUNCTION_INFO(C_VerifyFinal)
+#ifdef CK_NEED_ARG_LIST
+  (
+   CK_SESSION_HANDLE hSession,       /* the session's handle */
+   CK_BYTE_PTR       pSignature,     /* signature to verify */
+   CK_ULONG          ulSignatureLen  /* signature length */
+   );
+#endif
+
+
+/* C_VerifyRecoverInit initializes a signature verification
+ * operation, where the data is recovered from the signature. */
+CK_PKCS11_FUNCTION_INFO(C_VerifyRecoverInit)
+#ifdef CK_NEED_ARG_LIST
+  (
+   CK_SESSION_HANDLE hSession,    /* the session's handle */
+   CK_MECHANISM_PTR  pMechanism,  /* the verification mechanism */
+   CK_OBJECT_HANDLE  hKey         /* verification key */
+   );
+#endif
+
+
+/* C_VerifyRecover verifies a signature in a single-part
+ * operation, where the data is recovered from the signature. */
+CK_PKCS11_FUNCTION_INFO(C_VerifyRecover)
+#ifdef CK_NEED_ARG_LIST
+  (
+   CK_SESSION_HANDLE hSession,        /* the session's handle */
+   CK_BYTE_PTR       pSignature,      /* signature to verify */
+   CK_ULONG          ulSignatureLen,  /* signature length */
+   CK_BYTE_PTR       pData,           /* gets signed data */
+   CK_ULONG_PTR      pulDataLen       /* gets signed data len */
+   );
+#endif
+
+
+
+/* Dual-function cryptographic operations */
+
+/* C_DigestEncryptUpdate continues a multiple-part digesting
+ * and encryption operation. */
+CK_PKCS11_FUNCTION_INFO(C_DigestEncryptUpdate)
+#ifdef CK_NEED_ARG_LIST
+  (
+   CK_SESSION_HANDLE hSession,            /* session's handle */
+   CK_BYTE_PTR       pPart,               /* the plaintext data */
+   CK_ULONG          ulPartLen,           /* plaintext length */
+   CK_BYTE_PTR       pEncryptedPart,      /* gets ciphertext */
+   CK_ULONG_PTR      pulEncryptedPartLen  /* gets c-text length */
+   );
+#endif
+
+
+/* C_DecryptDigestUpdate continues a multiple-part decryption and
+ * digesting operation. */
+CK_PKCS11_FUNCTION_INFO(C_DecryptDigestUpdate)
+#ifdef CK_NEED_ARG_LIST
+  (
+   CK_SESSION_HANDLE hSession,            /* session's handle */
+   CK_BYTE_PTR       pEncryptedPart,      /* ciphertext */
+   CK_ULONG          ulEncryptedPartLen,  /* ciphertext length */
+   CK_BYTE_PTR       pPart,               /* gets plaintext */
+   CK_ULONG_PTR      pulPartLen           /* gets plaintext len */
+   );
+#endif
+
+
+/* C_SignEncryptUpdate continues a multiple-part signing and
+ * encryption operation. */
+CK_PKCS11_FUNCTION_INFO(C_SignEncryptUpdate)
+#ifdef CK_NEED_ARG_LIST
+  (
+   CK_SESSION_HANDLE hSession,            /* session's handle */
+   CK_BYTE_PTR       pPart,               /* the plaintext data */
+   CK_ULONG          ulPartLen,           /* plaintext length */
+   CK_BYTE_PTR       pEncryptedPart,      /* gets ciphertext */
+   CK_ULONG_PTR      pulEncryptedPartLen  /* gets c-text length */
+   );
+#endif
+
+
+/* C_DecryptVerifyUpdate continues a multiple-part decryption and
+ * verify operation. */
+CK_PKCS11_FUNCTION_INFO(C_DecryptVerifyUpdate)
+#ifdef CK_NEED_ARG_LIST
+  (
+   CK_SESSION_HANDLE hSession,            /* session's handle */
+   CK_BYTE_PTR       pEncryptedPart,      /* ciphertext */
+   CK_ULONG          ulEncryptedPartLen,  /* ciphertext length */
+   CK_BYTE_PTR       pPart,               /* gets plaintext */
+   CK_ULONG_PTR      pulPartLen           /* gets p-text length */
+   );
+#endif
+
+
+
+/* Key management */
+
+/* C_GenerateKey generates a secret key, creating a new key
+ * object. */
+CK_PKCS11_FUNCTION_INFO(C_GenerateKey)
+#ifdef CK_NEED_ARG_LIST
+  (
+   CK_SESSION_HANDLE    hSession,    /* the session's handle */
+   CK_MECHANISM_PTR     pMechanism,  /* key generation mech. */
+   CK_ATTRIBUTE_PTR     pTemplate,   /* template for new key */
+   CK_ULONG             ulCount,     /* # of attrs in template */
+   CK_OBJECT_HANDLE_PTR phKey        /* gets handle of new key */
+   );
+#endif
+
+
+/* C_GenerateKeyPair generates a public-key/private-key pair, 
+ * creating new key objects. */
+CK_PKCS11_FUNCTION_INFO(C_GenerateKeyPair)
+#ifdef CK_NEED_ARG_LIST
+  (
+   CK_SESSION_HANDLE    hSession,                    /* session
+						      * handle */
+   CK_MECHANISM_PTR     pMechanism,                  /* key-gen
+						      * mech. */
+   CK_ATTRIBUTE_PTR     pPublicKeyTemplate,          /* template
+						      * for pub.
+						      * key */
+   CK_ULONG             ulPublicKeyAttributeCount,   /* # pub.
+						      * attrs. */
+   CK_ATTRIBUTE_PTR     pPrivateKeyTemplate,         /* template
+						      * for priv.
+						      * key */
+   CK_ULONG             ulPrivateKeyAttributeCount,  /* # priv.
+						      * attrs. */
+   CK_OBJECT_HANDLE_PTR phPublicKey,                 /* gets pub.
+						      * key
+						      * handle */
+  CK_OBJECT_HANDLE_PTR phPrivateKey                 /* gets
+                                                     * priv. key
+                                                     * handle */
+   );
+#endif
+
+
+/* C_WrapKey wraps (i.e., encrypts) a key. */
+CK_PKCS11_FUNCTION_INFO(C_WrapKey)
+#ifdef CK_NEED_ARG_LIST
+  (
+   CK_SESSION_HANDLE hSession,        /* the session's handle */
+   CK_MECHANISM_PTR  pMechanism,      /* the wrapping mechanism */
+   CK_OBJECT_HANDLE  hWrappingKey,    /* wrapping key */
+   CK_OBJECT_HANDLE  hKey,            /* key to be wrapped */
+   CK_BYTE_PTR       pWrappedKey,     /* gets wrapped key */
+   CK_ULONG_PTR      pulWrappedKeyLen /* gets wrapped key size */
+   );
+#endif
+
+
+/* C_UnwrapKey unwraps (decrypts) a wrapped key, creating a new
+ * key object. */
+CK_PKCS11_FUNCTION_INFO(C_UnwrapKey)
+#ifdef CK_NEED_ARG_LIST
+  (
+   CK_SESSION_HANDLE    hSession,          /* session's handle */
+   CK_MECHANISM_PTR     pMechanism,        /* unwrapping mech. */
+   CK_OBJECT_HANDLE     hUnwrappingKey,    /* unwrapping key */
+   CK_BYTE_PTR          pWrappedKey,       /* the wrapped key */
+   CK_ULONG             ulWrappedKeyLen,   /* wrapped key len */
+   CK_ATTRIBUTE_PTR     pTemplate,         /* new key template */
+   CK_ULONG             ulAttributeCount,  /* template length */
+   CK_OBJECT_HANDLE_PTR phKey              /* gets new handle */
+   );
+#endif
+
+
+/* C_DeriveKey derives a key from a base key, creating a new key
+ * object. */
+CK_PKCS11_FUNCTION_INFO(C_DeriveKey)
+#ifdef CK_NEED_ARG_LIST
+  (
+   CK_SESSION_HANDLE    hSession,          /* session's handle */
+   CK_MECHANISM_PTR     pMechanism,        /* key deriv. mech. */
+   CK_OBJECT_HANDLE     hBaseKey,          /* base key */
+   CK_ATTRIBUTE_PTR     pTemplate,         /* new key template */
+   CK_ULONG             ulAttributeCount,  /* template length */
+   CK_OBJECT_HANDLE_PTR phKey              /* gets new handle */
+   );
+#endif
+
+
+
+/* Random number generation */
+
+/* C_SeedRandom mixes additional seed material into the token's
+ * random number generator. */
+CK_PKCS11_FUNCTION_INFO(C_SeedRandom)
+#ifdef CK_NEED_ARG_LIST
+  (
+   CK_SESSION_HANDLE hSession,  /* the session's handle */
+   CK_BYTE_PTR       pSeed,     /* the seed material */
+   CK_ULONG          ulSeedLen  /* length of seed material */
+   );
+#endif
+
+
+/* C_GenerateRandom generates random data. */
+CK_PKCS11_FUNCTION_INFO(C_GenerateRandom)
+#ifdef CK_NEED_ARG_LIST
+  (
+   CK_SESSION_HANDLE hSession,    /* the session's handle */
+   CK_BYTE_PTR       RandomData,  /* receives the random data */
+   CK_ULONG          ulRandomLen  /* # of bytes to generate */
+   );
+#endif
+
+
+
+/* Parallel function management */
+
+/* C_GetFunctionStatus is a legacy function; it obtains an
+ * updated status of a function running in parallel with an
+ * application. */
+CK_PKCS11_FUNCTION_INFO(C_GetFunctionStatus)
+#ifdef CK_NEED_ARG_LIST
+  (
+   CK_SESSION_HANDLE hSession  /* the session's handle */
+   );
+#endif
+
+
+/* C_CancelFunction is a legacy function; it cancels a function
+ * running in parallel. */
+CK_PKCS11_FUNCTION_INFO(C_CancelFunction)
+#ifdef CK_NEED_ARG_LIST
+  (
+   CK_SESSION_HANDLE hSession  /* the session's handle */
+   );
+#endif
+
+
+
+/* Functions added in for Cryptoki Version 2.01 or later */
+
+/* C_WaitForSlotEvent waits for a slot event (token insertion,
+ * removal, etc.) to occur. */
+CK_PKCS11_FUNCTION_INFO(C_WaitForSlotEvent)
+#ifdef CK_NEED_ARG_LIST
+  (
+   CK_FLAGS flags,        /* blocking/nonblocking flag */
+   CK_SLOT_ID_PTR pSlot,  /* location that receives the slot ID */
+   CK_VOID_PTR pRserved   /* reserved.  Should be NULL_PTR */
+   );
+#endif
diff -Nur bind-9.4.1-P1/lib/dns/pkcs11.h bind-9.4.1-P1.pkcs11/lib/dns/pkcs11.h
--- bind-9.4.1-P1/lib/dns/pkcs11.h	1969-12-31 16:00:00.000000000 -0800
+++ bind-9.4.1-P1.pkcs11/lib/dns/pkcs11.h	2007-08-06 17:03:44.000000000 -0700
@@ -0,0 +1,299 @@
+/* pkcs11.h include file for PKCS #11. */
+/* $Revision: 1.4 $ */
+
+/* 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.
+ */
+
+#ifndef _PKCS11_H_
+#define _PKCS11_H_ 1
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+  /* Before including this file (pkcs11.h) (or pkcs11t.h by
+   * itself), 6 platform-specific macros must be defined.  These
+   * macros are described below, and typical definitions for them
+   * are also given.  Be advised that these definitions can depend
+   * on both the platform and the compiler used (and possibly also
+   * on whether a Cryptoki library is linked statically or
+   * dynamically).
+   *
+   * In addition to defining these 6 macros, the packing convention
+   * for Cryptoki structures should be set.  The Cryptoki
+   * convention on packing is that structures should be 1-byte
+   * aligned.
+   *
+   * If you're using Microsoft Developer Studio 5.0 to produce
+   * Win32 stuff, this might be done by using the following
+   * preprocessor directive before including pkcs11.h or pkcs11t.h:
+   *
+   * #pragma pack(push, cryptoki, 1)
+   *
+   * and using the following preprocessor directive after including
+   * pkcs11.h or pkcs11t.h:
+   *
+   * #pragma pack(pop, cryptoki)
+   *
+   * If you're using an earlier version of Microsoft Developer
+   * Studio to produce Win16 stuff, this might be done by using
+   * the following preprocessor directive before including
+   * pkcs11.h or pkcs11t.h:
+   *
+   * #pragma pack(1)
+   *
+   * In a UNIX environment, you're on your own for this.  You might
+   * not need to do (or be able to do!) anything.
+   *
+   *
+   * Now for the macros:
+   *
+   *
+   * 1. CK_PTR: The indirection string for making a pointer to an
+   * object.  It can be used like this:
+   *
+   * typedef CK_BYTE CK_PTR CK_BYTE_PTR;
+   *
+   * If you're using Microsoft Developer Studio 5.0 to produce
+   * Win32 stuff, it might be defined by:
+   *
+   * #define CK_PTR *
+   *
+   * If you're using an earlier version of Microsoft Developer
+   * Studio to produce Win16 stuff, it might be defined by:
+   *
+   * #define CK_PTR far *
+   *
+   * In a typical UNIX environment, it might be defined by:
+   *
+   * #define CK_PTR *
+   *
+   *
+   * 2. CK_DEFINE_FUNCTION(returnType, name): A macro which makes
+   * an exportable Cryptoki library function definition out of a
+   * return type and a function name.  It should be used in the
+   * following fashion to define the exposed Cryptoki functions in
+   * a Cryptoki library:
+   *
+   * CK_DEFINE_FUNCTION(CK_RV, C_Initialize)(
+   *   CK_VOID_PTR pReserved
+   * )
+   * {
+   *   ...
+   * }
+   *
+   * If you're using Microsoft Developer Studio 5.0 to define a
+   * function in a Win32 Cryptoki .dll, it might be defined by:
+   *
+   * #define CK_DEFINE_FUNCTION(returnType, name) \
+   *   returnType __declspec(dllexport) name
+   *
+   * If you're using an earlier version of Microsoft Developer
+   * Studio to define a function in a Win16 Cryptoki .dll, it
+   * might be defined by:
+   *
+   * #define CK_DEFINE_FUNCTION(returnType, name) \
+   *   returnType __export _far _pascal name
+   *
+   * In a UNIX environment, it might be defined by:
+   *
+   * #define CK_DEFINE_FUNCTION(returnType, name) \
+   *   returnType name
+   *
+   *
+   * 3. CK_DECLARE_FUNCTION(returnType, name): A macro which makes
+   * an importable Cryptoki library function declaration out of a
+   * return type and a function name.  It should be used in the
+   * following fashion:
+   *
+   * extern CK_DECLARE_FUNCTION(CK_RV, C_Initialize)(
+   *   CK_VOID_PTR pReserved
+   * );
+   *
+   * If you're using Microsoft Developer Studio 5.0 to declare a
+   * function in a Win32 Cryptoki .dll, it might be defined by:
+   *
+   * #define CK_DECLARE_FUNCTION(returnType, name) \
+   *   returnType __declspec(dllimport) name
+   *
+   * If you're using an earlier version of Microsoft Developer
+   * Studio to declare a function in a Win16 Cryptoki .dll, it
+   * might be defined by:
+   *
+   * #define CK_DECLARE_FUNCTION(returnType, name) \
+   *   returnType __export _far _pascal name
+   *
+   * In a UNIX environment, it might be defined by:
+   *
+   * #define CK_DECLARE_FUNCTION(returnType, name) \
+   *   returnType name
+   *
+   *
+   * 4. CK_DECLARE_FUNCTION_POINTER(returnType, name): A macro
+   * which makes a Cryptoki API function pointer declaration or
+   * function pointer type declaration out of a return type and a
+   * function name.  It should be used in the following fashion:
+   *
+   * // Define funcPtr to be a pointer to a Cryptoki API function
+   * // taking arguments args and returning CK_RV.
+   * CK_DECLARE_FUNCTION_POINTER(CK_RV, funcPtr)(args);
+   *
+   * or
+   *
+   * // Define funcPtrType to be the type of a pointer to a
+   * // Cryptoki API function taking arguments args and returning
+   * // CK_RV, and then define funcPtr to be a variable of type
+   * // funcPtrType.
+   * typedef CK_DECLARE_FUNCTION_POINTER(CK_RV, funcPtrType)(args);
+   * funcPtrType funcPtr;
+   *
+   * If you're using Microsoft Developer Studio 5.0 to access
+   * functions in a Win32 Cryptoki .dll, in might be defined by:
+   *
+   * #define CK_DECLARE_FUNCTION_POINTER(returnType, name) \
+   *   returnType __declspec(dllimport) (* name)
+   *
+   * If you're using an earlier version of Microsoft Developer
+   * Studio to access functions in a Win16 Cryptoki .dll, it might
+   * be defined by:
+   *
+   * #define CK_DECLARE_FUNCTION_POINTER(returnType, name) \
+   *   returnType __export _far _pascal (* name)
+   *
+   * In a UNIX environment, it might be defined by:
+   *
+   * #define CK_DECLARE_FUNCTION_POINTER(returnType, name) \
+   *   returnType (* name)
+   *
+   *
+   * 5. CK_CALLBACK_FUNCTION(returnType, name): A macro which makes
+   * a function pointer type for an application callback out of
+   * a return type for the callback and a name for the callback.
+   * It should be used in the following fashion:
+   *
+   * CK_CALLBACK_FUNCTION(CK_RV, myCallback)(args);
+   *
+   * to declare a function pointer, myCallback, to a callback
+   * which takes arguments args and returns a CK_RV.  It can also
+   * be used like this:
+   *
+   * typedef CK_CALLBACK_FUNCTION(CK_RV, myCallbackType)(args);
+   * myCallbackType myCallback;
+   *
+   * If you're using Microsoft Developer Studio 5.0 to do Win32
+   * Cryptoki development, it might be defined by:
+   *
+   * #define CK_CALLBACK_FUNCTION(returnType, name) \
+   *   returnType (* name)
+   *
+   * If you're using an earlier version of Microsoft Developer
+   * Studio to do Win16 development, it might be defined by:
+   *
+   * #define CK_CALLBACK_FUNCTION(returnType, name) \
+   *   returnType _far _pascal (* name)
+   *
+   * In a UNIX environment, it might be defined by:
+   *
+   * #define CK_CALLBACK_FUNCTION(returnType, name) \
+   *   returnType (* name)
+   *
+   *
+   * 6. NULL_PTR: This macro is the value of a NULL pointer.
+   *
+   * In any ANSI/ISO C environment (and in many others as well),
+   * this should best be defined by
+   *
+   * #ifndef NULL_PTR
+   * #define NULL_PTR 0
+   * #endif
+   */
+
+
+  /* All the various Cryptoki types and #define'd values are in the
+   * file pkcs11t.h. */
+#include "pkcs11t.h"
+
+#define __PASTE(x,y)      x##y
+
+
+  /* ==============================================================
+   * Define the "extern" form of all the entry points.
+   * ==============================================================
+   */
+
+#define CK_NEED_ARG_LIST  1
+#define CK_PKCS11_FUNCTION_INFO(name) \
+  extern CK_DECLARE_FUNCTION(CK_RV, name)
+
+  /* pkcs11f.h has all the information about the Cryptoki
+   * function prototypes. */
+#include "pkcs11f.h"
+
+#undef CK_NEED_ARG_LIST
+#undef CK_PKCS11_FUNCTION_INFO
+
+
+  /* ==============================================================
+   * Define the typedef form of all the entry points.  That is, for
+   * each Cryptoki function C_XXX, define a type CK_C_XXX which is
+   * a pointer to that kind of function.
+   * ==============================================================
+   */
+
+#define CK_NEED_ARG_LIST  1
+#define CK_PKCS11_FUNCTION_INFO(name) \
+  typedef CK_DECLARE_FUNCTION_POINTER(CK_RV, __PASTE(CK_,name))
+
+  /* pkcs11f.h has all the information about the Cryptoki
+   * function prototypes. */
+#include "pkcs11f.h"
+
+#undef CK_NEED_ARG_LIST
+#undef CK_PKCS11_FUNCTION_INFO
+
+
+  /* ==============================================================
+   * Define structed vector of entry points.  A CK_FUNCTION_LIST
+   * contains a CK_VERSION indicating a library's Cryptoki version
+   * and then a whole slew of function pointers to the routines in
+   * the library.  This type was declared, but not defined, in
+   * pkcs11t.h.
+   * ==============================================================
+   */
+
+#define CK_PKCS11_FUNCTION_INFO(name) \
+  __PASTE(CK_,name) name;
+  
+  struct CK_FUNCTION_LIST {
+
+    CK_VERSION    version;  /* Cryptoki version */
+
+    /* Pile all the function pointers into the CK_FUNCTION_LIST. */
+    /* pkcs11f.h has all the information about the Cryptoki
+     * function prototypes. */
+#include "pkcs11f.h"
+
+  };
+
+#undef CK_PKCS11_FUNCTION_INFO
+
+
+#undef __PASTE
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff -Nur bind-9.4.1-P1/lib/dns/pkcs11t.h bind-9.4.1-P1.pkcs11/lib/dns/pkcs11t.h
--- bind-9.4.1-P1/lib/dns/pkcs11t.h	1969-12-31 16:00:00.000000000 -0800
+++ bind-9.4.1-P1.pkcs11/lib/dns/pkcs11t.h	2007-08-06 17:03:44.000000000 -0700
@@ -0,0 +1,1685 @@
+/* pkcs11t.h include file for PKCS #11. */
+/* $Revision: 1.6 $ */
+
+/* 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.
+ */
+
+/* See top of pkcs11.h for information about the macros that
+ * must be defined and the structure-packing conventions that
+ * must be set before including this file. */
+
+#ifndef _PKCS11T_H_
+#define _PKCS11T_H_ 1
+
+#define CK_TRUE 1
+#define CK_FALSE 0
+
+#ifndef CK_DISABLE_TRUE_FALSE
+#ifndef FALSE
+#define FALSE CK_FALSE
+#endif
+
+#ifndef TRUE
+#define TRUE CK_TRUE
+#endif
+#endif
+
+/* an unsigned 8-bit value */
+typedef unsigned char     CK_BYTE;
+
+/* an unsigned 8-bit character */
+typedef CK_BYTE           CK_CHAR;
+
+/* an 8-bit UTF-8 character */
+typedef CK_BYTE           CK_UTF8CHAR;
+
+/* a BYTE-sized Boolean flag */
+typedef CK_BYTE           CK_BBOOL;
+
+/* an unsigned value, at least 32 bits long */
+typedef unsigned long int CK_ULONG;
+
+/* a signed value, the same size as a CK_ULONG */
+/* CK_LONG is new for v2.0 */
+typedef long int          CK_LONG;
+
+/* at least 32 bits; each bit is a Boolean flag */
+typedef CK_ULONG          CK_FLAGS;
+
+
+/* some special values for certain CK_ULONG variables */
+#define CK_UNAVAILABLE_INFORMATION (~0UL)
+#define CK_EFFECTIVELY_INFINITE    0
+
+
+typedef CK_BYTE     CK_PTR   CK_BYTE_PTR;
+typedef CK_CHAR     CK_PTR   CK_CHAR_PTR;
+typedef CK_UTF8CHAR CK_PTR   CK_UTF8CHAR_PTR;
+typedef CK_ULONG    CK_PTR   CK_ULONG_PTR;
+typedef void        CK_PTR   CK_VOID_PTR;
+
+/* Pointer to a CK_VOID_PTR-- i.e., pointer to pointer to void */
+typedef CK_VOID_PTR CK_PTR CK_VOID_PTR_PTR;
+
+
+/* The following value is always invalid if used as a session */
+/* handle or object handle */
+#define CK_INVALID_HANDLE 0
+
+
+typedef struct CK_VERSION {
+  CK_BYTE       major;  /* integer portion of version number */
+  CK_BYTE       minor;  /* 1/100ths portion of version number */
+} CK_VERSION;
+
+typedef CK_VERSION CK_PTR CK_VERSION_PTR;
+
+
+typedef struct CK_INFO {
+  /* manufacturerID and libraryDecription have been changed from
+   * CK_CHAR to CK_UTF8CHAR for v2.10 */
+  CK_VERSION    cryptokiVersion;     /* Cryptoki interface ver */
+  CK_UTF8CHAR   manufacturerID[32];  /* blank padded */
+  CK_FLAGS      flags;               /* must be zero */
+
+  /* libraryDescription and libraryVersion are new for v2.0 */
+  CK_UTF8CHAR   libraryDescription[32];  /* blank padded */
+  CK_VERSION    libraryVersion;          /* version of library */
+} CK_INFO;
+
+typedef CK_INFO CK_PTR    CK_INFO_PTR;
+
+
+/* CK_NOTIFICATION enumerates the types of notifications that
+ * Cryptoki provides to an application */
+/* CK_NOTIFICATION has been changed from an enum to a CK_ULONG
+ * for v2.0 */
+typedef CK_ULONG CK_NOTIFICATION;
+#define CKN_SURRENDER       0
+
+
+typedef CK_ULONG          CK_SLOT_ID;
+
+typedef CK_SLOT_ID CK_PTR CK_SLOT_ID_PTR;
+
+
+/* CK_SLOT_INFO provides information about a slot */
+typedef struct CK_SLOT_INFO {
+  /* slotDescription and manufacturerID have been changed from
+   * CK_CHAR to CK_UTF8CHAR for v2.10 */
+  CK_UTF8CHAR   slotDescription[64];  /* blank padded */
+  CK_UTF8CHAR   manufacturerID[32];   /* blank padded */
+  CK_FLAGS      flags;
+
+  /* hardwareVersion and firmwareVersion are new for v2.0 */
+  CK_VERSION    hardwareVersion;  /* version of hardware */
+  CK_VERSION    firmwareVersion;  /* version of firmware */
+} CK_SLOT_INFO;
+
+/* flags: bit flags that provide capabilities of the slot
+ *      Bit Flag              Mask        Meaning
+ */
+#define CKF_TOKEN_PRESENT     0x00000001  /* a token is there */
+#define CKF_REMOVABLE_DEVICE  0x00000002  /* removable devices*/
+#define CKF_HW_SLOT           0x00000004  /* hardware slot */
+
+typedef CK_SLOT_INFO CK_PTR CK_SLOT_INFO_PTR;
+
+
+/* CK_TOKEN_INFO provides information about a token */
+typedef struct CK_TOKEN_INFO {
+  /* label, manufacturerID, and model have been changed from
+   * CK_CHAR to CK_UTF8CHAR for v2.10 */
+  CK_UTF8CHAR   label[32];           /* blank padded */
+  CK_UTF8CHAR   manufacturerID[32];  /* blank padded */
+  CK_UTF8CHAR   model[16];           /* blank padded */
+  CK_CHAR       serialNumber[16];    /* blank padded */
+  CK_FLAGS      flags;               /* see below */
+
+  /* ulMaxSessionCount, ulSessionCount, ulMaxRwSessionCount,
+   * ulRwSessionCount, ulMaxPinLen, and ulMinPinLen have all been
+   * changed from CK_USHORT to CK_ULONG for v2.0 */
+  CK_ULONG      ulMaxSessionCount;     /* max open sessions */
+  CK_ULONG      ulSessionCount;        /* sess. now open */
+  CK_ULONG      ulMaxRwSessionCount;   /* max R/W sessions */
+  CK_ULONG      ulRwSessionCount;      /* R/W sess. now open */
+  CK_ULONG      ulMaxPinLen;           /* in bytes */
+  CK_ULONG      ulMinPinLen;           /* in bytes */
+  CK_ULONG      ulTotalPublicMemory;   /* in bytes */
+  CK_ULONG      ulFreePublicMemory;    /* in bytes */
+  CK_ULONG      ulTotalPrivateMemory;  /* in bytes */
+  CK_ULONG      ulFreePrivateMemory;   /* in bytes */
+
+  /* hardwareVersion, firmwareVersion, and time are new for
+   * v2.0 */
+  CK_VERSION    hardwareVersion;       /* version of hardware */
+  CK_VERSION    firmwareVersion;       /* version of firmware */
+  CK_CHAR       utcTime[16];           /* time */
+} CK_TOKEN_INFO;
+
+/* The flags parameter is defined as follows:
+ *      Bit Flag                    Mask        Meaning
+ */
+#define CKF_RNG                     0x00000001  /* has random #
+                                                 * generator */
+#define CKF_WRITE_PROTECTED         0x00000002  /* token is
+                                                 * write-
+                                                 * protected */
+#define CKF_LOGIN_REQUIRED          0x00000004  /* user must
+                                                 * login */
+#define CKF_USER_PIN_INITIALIZED    0x00000008  /* normal user's
+                                                 * PIN is set */
+
+/* CKF_RESTORE_KEY_NOT_NEEDED is new for v2.0.  If it is set,
+ * that means that *every* time the state of cryptographic
+ * operations of a session is successfully saved, all keys
+ * needed to continue those operations are stored in the state */
+#define CKF_RESTORE_KEY_NOT_NEEDED  0x00000020
+
+/* CKF_CLOCK_ON_TOKEN is new for v2.0.  If it is set, that means
+ * that the token has some sort of clock.  The time on that
+ * clock is returned in the token info structure */
+#define CKF_CLOCK_ON_TOKEN          0x00000040
+
+/* CKF_PROTECTED_AUTHENTICATION_PATH is new for v2.0.  If it is
+ * set, that means that there is some way for the user to login
+ * without sending a PIN through the Cryptoki library itself */
+#define CKF_PROTECTED_AUTHENTICATION_PATH 0x00000100
+
+/* CKF_DUAL_CRYPTO_OPERATIONS is new for v2.0.  If it is true,
+ * that means that a single session with the token can perform
+ * dual simultaneous cryptographic operations (digest and
+ * encrypt; decrypt and digest; sign and encrypt; and decrypt
+ * and sign) */
+#define CKF_DUAL_CRYPTO_OPERATIONS  0x00000200
+
+/* CKF_TOKEN_INITIALIZED if new for v2.10. If it is true, the
+ * token has been initialized using C_InitializeToken or an
+ * equivalent mechanism outside the scope of PKCS #11.
+ * Calling C_InitializeToken when this flag is set will cause
+ * the token to be reinitialized. */
+#define CKF_TOKEN_INITIALIZED       0x00000400
+
+/* CKF_SECONDARY_AUTHENTICATION if new for v2.10. If it is
+ * true, the token supports secondary authentication for
+ * private key objects. This flag is deprecated in v2.11 and
+ onwards. */
+#define CKF_SECONDARY_AUTHENTICATION  0x00000800
+
+/* CKF_USER_PIN_COUNT_LOW if new for v2.10. If it is true, an
+ * incorrect user login PIN has been entered at least once
+ * since the last successful authentication. */
+#define CKF_USER_PIN_COUNT_LOW       0x00010000
+
+/* CKF_USER_PIN_FINAL_TRY if new for v2.10. If it is true,
+ * supplying an incorrect user PIN will it to become locked. */
+#define CKF_USER_PIN_FINAL_TRY       0x00020000
+
+/* CKF_USER_PIN_LOCKED if new for v2.10. If it is true, the
+ * user PIN has been locked. User login to the token is not
+ * possible. */
+#define CKF_USER_PIN_LOCKED          0x00040000
+
+/* CKF_USER_PIN_TO_BE_CHANGED if new for v2.10. If it is true,
+ * the user PIN value is the default value set by token
+ * initialization or manufacturing, or the PIN has been
+ * expired by the card. */
+#define CKF_USER_PIN_TO_BE_CHANGED   0x00080000
+
+/* CKF_SO_PIN_COUNT_LOW if new for v2.10. If it is true, an
+ * incorrect SO login PIN has been entered at least once since
+ * the last successful authentication. */
+#define CKF_SO_PIN_COUNT_LOW         0x00100000
+
+/* CKF_SO_PIN_FINAL_TRY if new for v2.10. If it is true,
+ * supplying an incorrect SO PIN will it to become locked. */
+#define CKF_SO_PIN_FINAL_TRY         0x00200000
+
+/* CKF_SO_PIN_LOCKED if new for v2.10. If it is true, the SO
+ * PIN has been locked. SO login to the token is not possible.
+ */
+#define CKF_SO_PIN_LOCKED            0x00400000
+
+/* CKF_SO_PIN_TO_BE_CHANGED if new for v2.10. If it is true,
+ * the SO PIN value is the default value set by token
+ * initialization or manufacturing, or the PIN has been
+ * expired by the card. */
+#define CKF_SO_PIN_TO_BE_CHANGED     0x00800000
+
+typedef CK_TOKEN_INFO CK_PTR CK_TOKEN_INFO_PTR;
+
+
+/* CK_SESSION_HANDLE is a Cryptoki-assigned value that
+ * identifies a session */
+typedef CK_ULONG          CK_SESSION_HANDLE;
+
+typedef CK_SESSION_HANDLE CK_PTR CK_SESSION_HANDLE_PTR;
+
+
+/* CK_USER_TYPE enumerates the types of Cryptoki users */
+/* CK_USER_TYPE has been changed from an enum to a CK_ULONG for
+ * v2.0 */
+typedef CK_ULONG          CK_USER_TYPE;
+/* Security Officer */
+#define CKU_SO    0
+/* Normal user */
+#define CKU_USER  1
+/* Context specific (added in v2.20) */
+#define CKU_CONTEXT_SPECIFIC   2
+
+/* CK_STATE enumerates the session states */
+/* CK_STATE has been changed from an enum to a CK_ULONG for
+ * v2.0 */
+typedef CK_ULONG          CK_STATE;
+#define CKS_RO_PUBLIC_SESSION  0
+#define CKS_RO_USER_FUNCTIONS  1
+#define CKS_RW_PUBLIC_SESSION  2
+#define CKS_RW_USER_FUNCTIONS  3
+#define CKS_RW_SO_FUNCTIONS    4
+
+
+/* CK_SESSION_INFO provides information about a session */
+typedef struct CK_SESSION_INFO {
+  CK_SLOT_ID    slotID;
+  CK_STATE      state;
+  CK_FLAGS      flags;          /* see below */
+
+  /* ulDeviceError was changed from CK_USHORT to CK_ULONG for
+   * v2.0 */
+  CK_ULONG      ulDeviceError;  /* device-dependent error code */
+} CK_SESSION_INFO;
+
+/* The flags are defined in the following table:
+ *      Bit Flag                Mask        Meaning
+ */
+#define CKF_RW_SESSION          0x00000002  /* session is r/w */
+#define CKF_SERIAL_SESSION      0x00000004  /* no parallel */
+
+typedef CK_SESSION_INFO CK_PTR CK_SESSION_INFO_PTR;
+
+
+/* CK_OBJECT_HANDLE is a token-specific identifier for an
+ * object  */
+typedef CK_ULONG          CK_OBJECT_HANDLE;
+
+typedef CK_OBJECT_HANDLE CK_PTR CK_OBJECT_HANDLE_PTR;
+
+
+/* CK_OBJECT_CLASS is a value that identifies the classes (or
+ * types) of objects that Cryptoki recognizes.  It is defined
+ * as follows: */
+/* CK_OBJECT_CLASS was changed from CK_USHORT to CK_ULONG for
+ * v2.0 */
+typedef CK_ULONG          CK_OBJECT_CLASS;
+
+/* The following classes of objects are defined: */
+/* CKO_HW_FEATURE is new for v2.10 */
+/* CKO_DOMAIN_PARAMETERS is new for v2.11 */
+/* CKO_MECHANISM is new for v2.20 */
+#define CKO_DATA              0x00000000
+#define CKO_CERTIFICATE       0x00000001
+#define CKO_PUBLIC_KEY        0x00000002
+#define CKO_PRIVATE_KEY       0x00000003
+#define CKO_SECRET_KEY        0x00000004
+#define CKO_HW_FEATURE        0x00000005
+#define CKO_DOMAIN_PARAMETERS 0x00000006
+#define CKO_MECHANISM         0x00000007
+#define CKO_VENDOR_DEFINED    0x80000000
+
+typedef CK_OBJECT_CLASS CK_PTR CK_OBJECT_CLASS_PTR;
+
+/* CK_HW_FEATURE_TYPE is new for v2.10. CK_HW_FEATURE_TYPE is a
+ * value that identifies the hardware feature type of an object
+ * with CK_OBJECT_CLASS equal to CKO_HW_FEATURE. */
+typedef CK_ULONG          CK_HW_FEATURE_TYPE;
+
+/* The following hardware feature types are defined */
+/* CKH_USER_INTERFACE is new for v2.20 */
+#define CKH_MONOTONIC_COUNTER  0x00000001
+#define CKH_CLOCK           0x00000002
+#define CKH_USER_INTERFACE  0x00000003
+#define CKH_VENDOR_DEFINED  0x80000000
+
+/* CK_KEY_TYPE is a value that identifies a key type */
+/* CK_KEY_TYPE was changed from CK_USHORT to CK_ULONG for v2.0 */
+typedef CK_ULONG          CK_KEY_TYPE;
+
+/* the following key types are defined: */
+#define CKK_RSA             0x00000000
+#define CKK_DSA             0x00000001
+#define CKK_DH              0x00000002
+
+/* CKK_ECDSA and CKK_KEA are new for v2.0 */
+/* CKK_ECDSA is deprecated in v2.11, CKK_EC is preferred. */
+#define CKK_ECDSA           0x00000003
+#define CKK_EC              0x00000003
+#define CKK_X9_42_DH        0x00000004
+#define CKK_KEA             0x00000005
+
+#define CKK_GENERIC_SECRET  0x00000010
+#define CKK_RC2             0x00000011
+#define CKK_RC4             0x00000012
+#define CKK_DES             0x00000013
+#define CKK_DES2            0x00000014
+#define CKK_DES3            0x00000015
+
+/* all these key types are new for v2.0 */
+#define CKK_CAST            0x00000016
+#define CKK_CAST3           0x00000017
+/* CKK_CAST5 is deprecated in v2.11, CKK_CAST128 is preferred. */
+#define CKK_CAST5           0x00000018
+#define CKK_CAST128         0x00000018
+#define CKK_RC5             0x00000019
+#define CKK_IDEA            0x0000001A
+#define CKK_SKIPJACK        0x0000001B
+#define CKK_BATON           0x0000001C
+#define CKK_JUNIPER         0x0000001D
+#define CKK_CDMF            0x0000001E
+#define CKK_AES             0x0000001F
+
+/* BlowFish and TwoFish are new for v2.20 */
+#define CKK_BLOWFISH        0x00000020
+#define CKK_TWOFISH         0x00000021
+
+#define CKK_VENDOR_DEFINED  0x80000000
+
+
+/* CK_CERTIFICATE_TYPE is a value that identifies a certificate
+ * type */
+/* CK_CERTIFICATE_TYPE was changed from CK_USHORT to CK_ULONG
+ * for v2.0 */
+typedef CK_ULONG          CK_CERTIFICATE_TYPE;
+
+/* The following certificate types are defined: */
+/* CKC_X_509_ATTR_CERT is new for v2.10 */
+/* CKC_WTLS is new for v2.20 */
+#define CKC_X_509           0x00000000
+#define CKC_X_509_ATTR_CERT 0x00000001
+#define CKC_WTLS            0x00000002
+#define CKC_VENDOR_DEFINED  0x80000000
+
+
+/* CK_ATTRIBUTE_TYPE is a value that identifies an attribute
+ * type */
+/* CK_ATTRIBUTE_TYPE was changed from CK_USHORT to CK_ULONG for
+ * v2.0 */
+typedef CK_ULONG          CK_ATTRIBUTE_TYPE;
+
+/* The CKF_ARRAY_ATTRIBUTE flag identifies an attribute which
+   consists of an array of values. */
+#define CKF_ARRAY_ATTRIBUTE    0x40000000
+
+/* The following attribute types are defined: */
+#define CKA_CLASS              0x00000000
+#define CKA_TOKEN              0x00000001
+#define CKA_PRIVATE            0x00000002
+#define CKA_LABEL              0x00000003
+#define CKA_APPLICATION        0x00000010
+#define CKA_VALUE              0x00000011
+
+/* CKA_OBJECT_ID is new for v2.10 */
+#define CKA_OBJECT_ID          0x00000012
+
+#define CKA_CERTIFICATE_TYPE   0x00000080
+#define CKA_ISSUER             0x00000081
+#define CKA_SERIAL_NUMBER      0x00000082
+
+/* CKA_AC_ISSUER, CKA_OWNER, and CKA_ATTR_TYPES are new
+ * for v2.10 */
+#define CKA_AC_ISSUER          0x00000083
+#define CKA_OWNER              0x00000084
+#define CKA_ATTR_TYPES         0x00000085
+
+/* CKA_TRUSTED is new for v2.11 */
+#define CKA_TRUSTED            0x00000086
+
+/* CKA_CERTIFICATE_CATEGORY ...
+ * CKA_CHECK_VALUE are new for v2.20 */
+#define CKA_CERTIFICATE_CATEGORY        0x00000087
+#define CKA_JAVA_MIDP_SECURITY_DOMAIN   0x00000088
+#define CKA_URL                         0x00000089
+#define CKA_HASH_OF_SUBJECT_PUBLIC_KEY  0x0000008A
+#define CKA_HASH_OF_ISSUER_PUBLIC_KEY   0x0000008B
+#define CKA_CHECK_VALUE                 0x00000090
+
+#define CKA_KEY_TYPE           0x00000100
+#define CKA_SUBJECT            0x00000101
+#define CKA_ID                 0x00000102
+#define CKA_SENSITIVE          0x00000103
+#define CKA_ENCRYPT            0x00000104
+#define CKA_DECRYPT            0x00000105
+#define CKA_WRAP               0x00000106
+#define CKA_UNWRAP             0x00000107
+#define CKA_SIGN               0x00000108
+#define CKA_SIGN_RECOVER       0x00000109
+#define CKA_VERIFY             0x0000010A
+#define CKA_VERIFY_RECOVER     0x0000010B
+#define CKA_DERIVE             0x0000010C
+#define CKA_START_DATE         0x00000110
+#define CKA_END_DATE           0x00000111
+#define CKA_MODULUS            0x00000120
+#define CKA_MODULUS_BITS       0x00000121
+#define CKA_PUBLIC_EXPONENT    0x00000122
+#define CKA_PRIVATE_EXPONENT   0x00000123
+#define CKA_PRIME_1            0x00000124
+#define CKA_PRIME_2            0x00000125
+#define CKA_EXPONENT_1         0x00000126
+#define CKA_EXPONENT_2         0x00000127
+#define CKA_COEFFICIENT        0x00000128
+#define CKA_PRIME              0x00000130
+#define CKA_SUBPRIME           0x00000131
+#define CKA_BASE               0x00000132
+
+/* CKA_PRIME_BITS and CKA_SUB_PRIME_BITS are new for v2.11 */
+#define CKA_PRIME_BITS         0x00000133
+#define CKA_SUBPRIME_BITS      0x00000134
+#define CKA_SUB_PRIME_BITS     CKA_SUBPRIME_BITS
+/* (To retain backwards-compatibility) */
+
+#define CKA_VALUE_BITS         0x00000160
+#define CKA_VALUE_LEN          0x00000161
+
+/* CKA_EXTRACTABLE, CKA_LOCAL, CKA_NEVER_EXTRACTABLE,
+ * CKA_ALWAYS_SENSITIVE, CKA_MODIFIABLE, CKA_ECDSA_PARAMS,
+ * and CKA_EC_POINT are new for v2.0 */
+#define CKA_EXTRACTABLE        0x00000162
+#define CKA_LOCAL              0x00000163
+#define CKA_NEVER_EXTRACTABLE  0x00000164
+#define CKA_ALWAYS_SENSITIVE   0x00000165
+
+/* CKA_KEY_GEN_MECHANISM is new for v2.11 */
+#define CKA_KEY_GEN_MECHANISM  0x00000166
+
+#define CKA_MODIFIABLE         0x00000170
+
+/* CKA_ECDSA_PARAMS is deprecated in v2.11,
+ * CKA_EC_PARAMS is preferred. */
+#define CKA_ECDSA_PARAMS       0x00000180
+#define CKA_EC_PARAMS          0x00000180
+
+#define CKA_EC_POINT           0x00000181
+
+/* CKA_SECONDARY_AUTH, CKA_AUTH_PIN_FLAGS,
+ * are new for v2.10. Deprecated in v2.11 and onwards. */
+#define CKA_SECONDARY_AUTH     0x00000200
+#define CKA_AUTH_PIN_FLAGS     0x00000201
+
+/* CKA_ALWAYS_AUTHENTICATE ...
+ * CKA_UNWRAP_TEMPLATE are new for v2.20 */
+#define CKA_ALWAYS_AUTHENTICATE  0x00000202
+
+#define CKA_WRAP_WITH_TRUSTED    0x00000210
+#define CKA_WRAP_TEMPLATE        (CKF_ARRAY_ATTRIBUTE|0x00000211)
+#define CKA_UNWRAP_TEMPLATE      (CKF_ARRAY_ATTRIBUTE|0x00000212)
+
+/* CKA_HW_FEATURE_TYPE, CKA_RESET_ON_INIT, and CKA_HAS_RESET
+ * are new for v2.10 */
+#define CKA_HW_FEATURE_TYPE    0x00000300
+#define CKA_RESET_ON_INIT      0x00000301
+#define CKA_HAS_RESET          0x00000302
+
+/* The following attributes are new for v2.20 */
+#define CKA_PIXEL_X                     0x00000400
+#define CKA_PIXEL_Y                     0x00000401
+#define CKA_RESOLUTION                  0x00000402
+#define CKA_CHAR_ROWS                   0x00000403
+#define CKA_CHAR_COLUMNS                0x00000404
+#define CKA_COLOR                       0x00000405
+#define CKA_BITS_PER_PIXEL              0x00000406
+#define CKA_CHAR_SETS                   0x00000480
+#define CKA_ENCODING_METHODS            0x00000481
+#define CKA_MIME_TYPES                  0x00000482
+#define CKA_MECHANISM_TYPE              0x00000500
+#define CKA_REQUIRED_CMS_ATTRIBUTES     0x00000501
+#define CKA_DEFAULT_CMS_ATTRIBUTES      0x00000502
+#define CKA_SUPPORTED_CMS_ATTRIBUTES    0x00000503
+#define CKA_ALLOWED_MECHANISMS          (CKF_ARRAY_ATTRIBUTE|0x00000600)
+
+#define CKA_VENDOR_DEFINED     0x80000000
+
+
+/* CK_ATTRIBUTE is a structure that includes the type, length
+ * and value of an attribute */
+typedef struct CK_ATTRIBUTE {
+  CK_ATTRIBUTE_TYPE type;
+  CK_VOID_PTR       pValue;
+
+  /* ulValueLen went from CK_USHORT to CK_ULONG for v2.0 */
+  CK_ULONG          ulValueLen;  /* in bytes */
+} CK_ATTRIBUTE;
+
+typedef CK_ATTRIBUTE CK_PTR CK_ATTRIBUTE_PTR;
+
+
+/* CK_DATE is a structure that defines a date */
+typedef struct CK_DATE{
+  CK_CHAR       year[4];   /* the year ("1900" - "9999") */
+  CK_CHAR       month[2];  /* the month ("01" - "12") */
+  CK_CHAR       day[2];    /* the day   ("01" - "31") */
+} CK_DATE;
+
+
+/* CK_MECHANISM_TYPE is a value that identifies a mechanism
+ * type */
+/* CK_MECHANISM_TYPE was changed from CK_USHORT to CK_ULONG for
+ * v2.0 */
+typedef CK_ULONG          CK_MECHANISM_TYPE;
+
+/* the following mechanism types are defined: */
+#define CKM_RSA_PKCS_KEY_PAIR_GEN      0x00000000
+#define CKM_RSA_PKCS                   0x00000001
+#define CKM_RSA_9796                   0x00000002
+#define CKM_RSA_X_509                  0x00000003
+
+/* CKM_MD2_RSA_PKCS, CKM_MD5_RSA_PKCS, and CKM_SHA1_RSA_PKCS
+ * are new for v2.0.  They are mechanisms which hash and sign */
+#define CKM_MD2_RSA_PKCS               0x00000004
+#define CKM_MD5_RSA_PKCS               0x00000005
+#define CKM_SHA1_RSA_PKCS              0x00000006
+
+/* CKM_RIPEMD128_RSA_PKCS, CKM_RIPEMD160_RSA_PKCS, and
+ * CKM_RSA_PKCS_OAEP are new for v2.10 */
+#define CKM_RIPEMD128_RSA_PKCS         0x00000007
+#define CKM_RIPEMD160_RSA_PKCS         0x00000008
+#define CKM_RSA_PKCS_OAEP              0x00000009
+
+/* CKM_RSA_X9_31_KEY_PAIR_GEN, CKM_RSA_X9_31, CKM_SHA1_RSA_X9_31,
+ * CKM_RSA_PKCS_PSS, and CKM_SHA1_RSA_PKCS_PSS are new for v2.11 */
+#define CKM_RSA_X9_31_KEY_PAIR_GEN     0x0000000A
+#define CKM_RSA_X9_31                  0x0000000B
+#define CKM_SHA1_RSA_X9_31             0x0000000C
+#define CKM_RSA_PKCS_PSS               0x0000000D
+#define CKM_SHA1_RSA_PKCS_PSS          0x0000000E
+
+#define CKM_DSA_KEY_PAIR_GEN           0x00000010
+#define CKM_DSA                        0x00000011
+#define CKM_DSA_SHA1                   0x00000012
+#define CKM_DH_PKCS_KEY_PAIR_GEN       0x00000020
+#define CKM_DH_PKCS_DERIVE             0x00000021
+
+/* CKM_X9_42_DH_KEY_PAIR_GEN, CKM_X9_42_DH_DERIVE,
+ * CKM_X9_42_DH_HYBRID_DERIVE, and CKM_X9_42_MQV_DERIVE are new for
+ * v2.11 */
+#define CKM_X9_42_DH_KEY_PAIR_GEN      0x00000030
+#define CKM_X9_42_DH_DERIVE            0x00000031
+#define CKM_X9_42_DH_HYBRID_DERIVE     0x00000032
+#define CKM_X9_42_MQV_DERIVE           0x00000033
+
+/* CKM_SHA256/384/512 are new for v2.20 */
+#define CKM_SHA256_RSA_PKCS            0x00000040
+#define CKM_SHA384_RSA_PKCS            0x00000041
+#define CKM_SHA512_RSA_PKCS            0x00000042
+#define CKM_SHA256_RSA_PKCS_PSS        0x00000043
+#define CKM_SHA384_RSA_PKCS_PSS        0x00000044
+#define CKM_SHA512_RSA_PKCS_PSS        0x00000045
+
+#define CKM_RC2_KEY_GEN                0x00000100
+#define CKM_RC2_ECB                    0x00000101
+#define CKM_RC2_CBC                    0x00000102
+#define CKM_RC2_MAC                    0x00000103
+
+/* CKM_RC2_MAC_GENERAL and CKM_RC2_CBC_PAD are new for v2.0 */
+#define CKM_RC2_MAC_GENERAL            0x00000104
+#define CKM_RC2_CBC_PAD                0x00000105
+
+#define CKM_RC4_KEY_GEN                0x00000110
+#define CKM_RC4                        0x00000111
+#define CKM_DES_KEY_GEN                0x00000120
+#define CKM_DES_ECB                    0x00000121
+#define CKM_DES_CBC                    0x00000122
+#define CKM_DES_MAC                    0x00000123
+
+/* CKM_DES_MAC_GENERAL and CKM_DES_CBC_PAD are new for v2.0 */
+#define CKM_DES_MAC_GENERAL            0x00000124
+#define CKM_DES_CBC_PAD                0x00000125
+
+#define CKM_DES2_KEY_GEN               0x00000130
+#define CKM_DES3_KEY_GEN               0x00000131
+#define CKM_DES3_ECB                   0x00000132
+#define CKM_DES3_CBC                   0x00000133
+#define CKM_DES3_MAC                   0x00000134
+
+/* CKM_DES3_MAC_GENERAL, CKM_DES3_CBC_PAD, CKM_CDMF_KEY_GEN,
+ * CKM_CDMF_ECB, CKM_CDMF_CBC, CKM_CDMF_MAC,
+ * CKM_CDMF_MAC_GENERAL, and CKM_CDMF_CBC_PAD are new for v2.0 */
+#define CKM_DES3_MAC_GENERAL           0x00000135
+#define CKM_DES3_CBC_PAD               0x00000136
+#define CKM_CDMF_KEY_GEN               0x00000140
+#define CKM_CDMF_ECB                   0x00000141
+#define CKM_CDMF_CBC                   0x00000142
+#define CKM_CDMF_MAC                   0x00000143
+#define CKM_CDMF_MAC_GENERAL           0x00000144
+#define CKM_CDMF_CBC_PAD               0x00000145
+
+/* the following four DES mechanisms are new for v2.20 */
+#define CKM_DES_OFB64                  0x00000150
+#define CKM_DES_OFB8                   0x00000151
+#define CKM_DES_CFB64                  0x00000152
+#define CKM_DES_CFB8                   0x00000153
+
+#define CKM_MD2                        0x00000200
+
+/* CKM_MD2_HMAC and CKM_MD2_HMAC_GENERAL are new for v2.0 */
+#define CKM_MD2_HMAC                   0x00000201
+#define CKM_MD2_HMAC_GENERAL           0x00000202
+
+#define CKM_MD5                        0x00000210
+
+/* CKM_MD5_HMAC and CKM_MD5_HMAC_GENERAL are new for v2.0 */
+#define CKM_MD5_HMAC                   0x00000211
+#define CKM_MD5_HMAC_GENERAL           0x00000212
+
+#define CKM_SHA_1                      0x00000220
+
+/* CKM_SHA_1_HMAC and CKM_SHA_1_HMAC_GENERAL are new for v2.0 */
+#define CKM_SHA_1_HMAC                 0x00000221
+#define CKM_SHA_1_HMAC_GENERAL         0x00000222
+
+/* CKM_RIPEMD128, CKM_RIPEMD128_HMAC,
+ * CKM_RIPEMD128_HMAC_GENERAL, CKM_RIPEMD160, CKM_RIPEMD160_HMAC,
+ * and CKM_RIPEMD160_HMAC_GENERAL are new for v2.10 */
+#define CKM_RIPEMD128                  0x00000230
+#define CKM_RIPEMD128_HMAC             0x00000231
+#define CKM_RIPEMD128_HMAC_GENERAL     0x00000232
+#define CKM_RIPEMD160                  0x00000240
+#define CKM_RIPEMD160_HMAC             0x00000241
+#define CKM_RIPEMD160_HMAC_GENERAL     0x00000242
+
+/* CKM_SHA256/384/512 are new for v2.20 */
+#define CKM_SHA256                     0x00000250
+#define CKM_SHA256_HMAC                0x00000251
+#define CKM_SHA256_HMAC_GENERAL        0x00000252
+#define CKM_SHA384                     0x00000260
+#define CKM_SHA384_HMAC                0x00000261
+#define CKM_SHA384_HMAC_GENERAL        0x00000262
+#define CKM_SHA512                     0x00000270
+#define CKM_SHA512_HMAC                0x00000271
+#define CKM_SHA512_HMAC_GENERAL        0x00000272
+
+/* All of the following mechanisms are new for v2.0 */
+/* Note that CAST128 and CAST5 are the same algorithm */
+#define CKM_CAST_KEY_GEN               0x00000300
+#define CKM_CAST_ECB                   0x00000301
+#define CKM_CAST_CBC                   0x00000302
+#define CKM_CAST_MAC                   0x00000303
+#define CKM_CAST_MAC_GENERAL           0x00000304
+#define CKM_CAST_CBC_PAD               0x00000305
+#define CKM_CAST3_KEY_GEN              0x00000310
+#define CKM_CAST3_ECB                  0x00000311
+#define CKM_CAST3_CBC                  0x00000312
+#define CKM_CAST3_MAC                  0x00000313
+#define CKM_CAST3_MAC_GENERAL          0x00000314
+#define CKM_CAST3_CBC_PAD              0x00000315
+#define CKM_CAST5_KEY_GEN              0x00000320
+#define CKM_CAST128_KEY_GEN            0x00000320
+#define CKM_CAST5_ECB                  0x00000321
+#define CKM_CAST128_ECB                0x00000321
+#define CKM_CAST5_CBC                  0x00000322
+#define CKM_CAST128_CBC                0x00000322
+#define CKM_CAST5_MAC                  0x00000323
+#define CKM_CAST128_MAC                0x00000323
+#define CKM_CAST5_MAC_GENERAL          0x00000324
+#define CKM_CAST128_MAC_GENERAL        0x00000324
+#define CKM_CAST5_CBC_PAD              0x00000325
+#define CKM_CAST128_CBC_PAD            0x00000325
+#define CKM_RC5_KEY_GEN                0x00000330
+#define CKM_RC5_ECB                    0x00000331
+#define CKM_RC5_CBC                    0x00000332
+#define CKM_RC5_MAC                    0x00000333
+#define CKM_RC5_MAC_GENERAL            0x00000334
+#define CKM_RC5_CBC_PAD                0x00000335
+#define CKM_IDEA_KEY_GEN               0x00000340
+#define CKM_IDEA_ECB                   0x00000341
+#define CKM_IDEA_CBC                   0x00000342
+#define CKM_IDEA_MAC                   0x00000343
+#define CKM_IDEA_MAC_GENERAL           0x00000344
+#define CKM_IDEA_CBC_PAD               0x00000345
+#define CKM_GENERIC_SECRET_KEY_GEN     0x00000350
+#define CKM_CONCATENATE_BASE_AND_KEY   0x00000360
+#define CKM_CONCATENATE_BASE_AND_DATA  0x00000362
+#define CKM_CONCATENATE_DATA_AND_BASE  0x00000363
+#define CKM_XOR_BASE_AND_DATA          0x00000364
+#define CKM_EXTRACT_KEY_FROM_KEY       0x00000365
+#define CKM_SSL3_PRE_MASTER_KEY_GEN    0x00000370
+#define CKM_SSL3_MASTER_KEY_DERIVE     0x00000371
+#define CKM_SSL3_KEY_AND_MAC_DERIVE    0x00000372
+
+/* CKM_SSL3_MASTER_KEY_DERIVE_DH, CKM_TLS_PRE_MASTER_KEY_GEN,
+ * CKM_TLS_MASTER_KEY_DERIVE, CKM_TLS_KEY_AND_MAC_DERIVE, and
+ * CKM_TLS_MASTER_KEY_DERIVE_DH are new for v2.11 */
+#define CKM_SSL3_MASTER_KEY_DERIVE_DH  0x00000373
+#define CKM_TLS_PRE_MASTER_KEY_GEN     0x00000374
+#define CKM_TLS_MASTER_KEY_DERIVE      0x00000375
+#define CKM_TLS_KEY_AND_MAC_DERIVE     0x00000376
+#define CKM_TLS_MASTER_KEY_DERIVE_DH   0x00000377
+
+/* CKM_TLS_PRF is new for v2.20 */
+#define CKM_TLS_PRF                    0x00000378
+
+#define CKM_SSL3_MD5_MAC               0x00000380
+#define CKM_SSL3_SHA1_MAC              0x00000381
+#define CKM_MD5_KEY_DERIVATION         0x00000390
+#define CKM_MD2_KEY_DERIVATION         0x00000391
+#define CKM_SHA1_KEY_DERIVATION        0x00000392
+
+/* CKM_SHA256/384/512 are new for v2.20 */
+#define CKM_SHA256_KEY_DERIVATION      0x00000393
+#define CKM_SHA384_KEY_DERIVATION      0x00000394
+#define CKM_SHA512_KEY_DERIVATION      0x00000395
+
+#define CKM_PBE_MD2_DES_CBC            0x000003A0
+#define CKM_PBE_MD5_DES_CBC            0x000003A1
+#define CKM_PBE_MD5_CAST_CBC           0x000003A2
+#define CKM_PBE_MD5_CAST3_CBC          0x000003A3
+#define CKM_PBE_MD5_CAST5_CBC          0x000003A4
+#define CKM_PBE_MD5_CAST128_CBC        0x000003A4
+#define CKM_PBE_SHA1_CAST5_CBC         0x000003A5
+#define CKM_PBE_SHA1_CAST128_CBC       0x000003A5
+#define CKM_PBE_SHA1_RC4_128           0x000003A6
+#define CKM_PBE_SHA1_RC4_40            0x000003A7
+#define CKM_PBE_SHA1_DES3_EDE_CBC      0x000003A8
+#define CKM_PBE_SHA1_DES2_EDE_CBC      0x000003A9
+#define CKM_PBE_SHA1_RC2_128_CBC       0x000003AA
+#define CKM_PBE_SHA1_RC2_40_CBC        0x000003AB
+
+/* CKM_PKCS5_PBKD2 is new for v2.10 */
+#define CKM_PKCS5_PBKD2                0x000003B0
+
+#define CKM_PBA_SHA1_WITH_SHA1_HMAC    0x000003C0
+
+/* WTLS mechanisms are new for v2.20 */
+#define CKM_WTLS_PRE_MASTER_KEY_GEN         0x000003D0
+#define CKM_WTLS_MASTER_KEY_DERIVE          0x000003D1
+#define CKM_WTLS_MASTER_KEY_DERIVE_DH_ECC   0x000003D2
+#define CKM_WTLS_PRF                        0x000003D3
+#define CKM_WTLS_SERVER_KEY_AND_MAC_DERIVE  0x000003D4
+#define CKM_WTLS_CLIENT_KEY_AND_MAC_DERIVE  0x000003D5
+
+#define CKM_KEY_WRAP_LYNKS             0x00000400
+#define CKM_KEY_WRAP_SET_OAEP          0x00000401
+
+/* CKM_CMS_SIG is new for v2.20 */
+#define CKM_CMS_SIG                    0x00000500
+
+/* Fortezza mechanisms */
+#define CKM_SKIPJACK_KEY_GEN           0x00001000
+#define CKM_SKIPJACK_ECB64             0x00001001
+#define CKM_SKIPJACK_CBC64             0x00001002
+#define CKM_SKIPJACK_OFB64             0x00001003
+#define CKM_SKIPJACK_CFB64             0x00001004
+#define CKM_SKIPJACK_CFB32             0x00001005
+#define CKM_SKIPJACK_CFB16             0x00001006
+#define CKM_SKIPJACK_CFB8              0x00001007
+#define CKM_SKIPJACK_WRAP              0x00001008
+#define CKM_SKIPJACK_PRIVATE_WRAP      0x00001009
+#define CKM_SKIPJACK_RELAYX            0x0000100a
+#define CKM_KEA_KEY_PAIR_GEN           0x00001010
+#define CKM_KEA_KEY_DERIVE             0x00001011
+#define CKM_FORTEZZA_TIMESTAMP         0x00001020
+#define CKM_BATON_KEY_GEN              0x00001030
+#define CKM_BATON_ECB128               0x00001031
+#define CKM_BATON_ECB96                0x00001032
+#define CKM_BATON_CBC128               0x00001033
+#define CKM_BATON_COUNTER              0x00001034
+#define CKM_BATON_SHUFFLE              0x00001035
+#define CKM_BATON_WRAP                 0x00001036
+
+/* CKM_ECDSA_KEY_PAIR_GEN is deprecated in v2.11,
+ * CKM_EC_KEY_PAIR_GEN is preferred */
+#define CKM_ECDSA_KEY_PAIR_GEN         0x00001040
+#define CKM_EC_KEY_PAIR_GEN            0x00001040
+
+#define CKM_ECDSA                      0x00001041
+#define CKM_ECDSA_SHA1                 0x00001042
+
+/* CKM_ECDH1_DERIVE, CKM_ECDH1_COFACTOR_DERIVE, and CKM_ECMQV_DERIVE
+ * are new for v2.11 */
+#define CKM_ECDH1_DERIVE               0x00001050
+#define CKM_ECDH1_COFACTOR_DERIVE      0x00001051
+#define CKM_ECMQV_DERIVE               0x00001052
+
+#define CKM_JUNIPER_KEY_GEN            0x00001060
+#define CKM_JUNIPER_ECB128             0x00001061
+#define CKM_JUNIPER_CBC128             0x00001062
+#define CKM_JUNIPER_COUNTER            0x00001063
+#define CKM_JUNIPER_SHUFFLE            0x00001064
+#define CKM_JUNIPER_WRAP               0x00001065
+#define CKM_FASTHASH                   0x00001070
+
+/* CKM_AES_KEY_GEN, CKM_AES_ECB, CKM_AES_CBC, CKM_AES_MAC,
+ * CKM_AES_MAC_GENERAL, CKM_AES_CBC_PAD, CKM_DSA_PARAMETER_GEN,
+ * CKM_DH_PKCS_PARAMETER_GEN, and CKM_X9_42_DH_PARAMETER_GEN are
+ * new for v2.11 */
+#define CKM_AES_KEY_GEN                0x00001080
+#define CKM_AES_ECB                    0x00001081
+#define CKM_AES_CBC                    0x00001082
+#define CKM_AES_MAC                    0x00001083
+#define CKM_AES_MAC_GENERAL            0x00001084
+#define CKM_AES_CBC_PAD                0x00001085
+
+/* BlowFish and TwoFish are new for v2.20 */
+#define CKM_BLOWFISH_KEY_GEN           0x00001090
+#define CKM_BLOWFISH_CBC               0x00001091
+#define CKM_TWOFISH_KEY_GEN            0x00001092
+#define CKM_TWOFISH_CBC                0x00001093
+
+
+/* CKM_xxx_ENCRYPT_DATA mechanisms are new for v2.20 */
+#define CKM_DES_ECB_ENCRYPT_DATA       0x00001100
+#define CKM_DES_CBC_ENCRYPT_DATA       0x00001101
+#define CKM_DES3_ECB_ENCRYPT_DATA      0x00001102
+#define CKM_DES3_CBC_ENCRYPT_DATA      0x00001103
+#define CKM_AES_ECB_ENCRYPT_DATA       0x00001104
+#define CKM_AES_CBC_ENCRYPT_DATA       0x00001105
+
+#define CKM_DSA_PARAMETER_GEN          0x00002000
+#define CKM_DH_PKCS_PARAMETER_GEN      0x00002001
+#define CKM_X9_42_DH_PARAMETER_GEN     0x00002002
+
+#define CKM_VENDOR_DEFINED             0x80000000
+
+typedef CK_MECHANISM_TYPE CK_PTR CK_MECHANISM_TYPE_PTR;
+
+
+/* CK_MECHANISM is a structure that specifies a particular
+ * mechanism  */
+typedef struct CK_MECHANISM {
+  CK_MECHANISM_TYPE mechanism;
+  CK_VOID_PTR       pParameter;
+
+  /* ulParameterLen was changed from CK_USHORT to CK_ULONG for
+   * v2.0 */
+  CK_ULONG          ulParameterLen;  /* in bytes */
+} CK_MECHANISM;
+
+typedef CK_MECHANISM CK_PTR CK_MECHANISM_PTR;
+
+
+/* CK_MECHANISM_INFO provides information about a particular
+ * mechanism */
+typedef struct CK_MECHANISM_INFO {
+  CK_ULONG    ulMinKeySize;
+  CK_ULONG    ulMaxKeySize;
+  CK_FLAGS    flags;
+} CK_MECHANISM_INFO;
+
+/* The flags are defined as follows:
+ *      Bit Flag               Mask        Meaning */
+#define CKF_HW                 0x00000001  /* performed by HW */
+
+/* The flags CKF_ENCRYPT, CKF_DECRYPT, CKF_DIGEST, CKF_SIGN,
+ * CKG_SIGN_RECOVER, CKF_VERIFY, CKF_VERIFY_RECOVER,
+ * CKF_GENERATE, CKF_GENERATE_KEY_PAIR, CKF_WRAP, CKF_UNWRAP,
+ * and CKF_DERIVE are new for v2.0.  They specify whether or not
+ * a mechanism can be used for a particular task */
+#define CKF_ENCRYPT            0x00000100
+#define CKF_DECRYPT            0x00000200
+#define CKF_DIGEST             0x00000400
+#define CKF_SIGN               0x00000800
+#define CKF_SIGN_RECOVER       0x00001000
+#define CKF_VERIFY             0x00002000
+#define CKF_VERIFY_RECOVER     0x00004000
+#define CKF_GENERATE           0x00008000
+#define CKF_GENERATE_KEY_PAIR  0x00010000
+#define CKF_WRAP               0x00020000
+#define CKF_UNWRAP             0x00040000
+#define CKF_DERIVE             0x00080000
+
+/* CKF_EC_F_P, CKF_EC_F_2M, CKF_EC_ECPARAMETERS, CKF_EC_NAMEDCURVE,
+ * CKF_EC_UNCOMPRESS, and CKF_EC_COMPRESS are new for v2.11. They
+ * describe a token's EC capabilities not available in mechanism
+ * information. */
+#define CKF_EC_F_P             0x00100000
+#define CKF_EC_F_2M            0x00200000
+#define CKF_EC_ECPARAMETERS    0x00400000
+#define CKF_EC_NAMEDCURVE      0x00800000
+#define CKF_EC_UNCOMPRESS      0x01000000
+#define CKF_EC_COMPRESS        0x02000000
+
+#define CKF_EXTENSION          0x80000000 /* FALSE for this version */
+
+typedef CK_MECHANISM_INFO CK_PTR CK_MECHANISM_INFO_PTR;
+
+
+/* CK_RV is a value that identifies the return value of a
+ * Cryptoki function */
+/* CK_RV was changed from CK_USHORT to CK_ULONG for v2.0 */
+typedef CK_ULONG          CK_RV;
+
+#define CKR_OK                                0x00000000
+#define CKR_CANCEL                            0x00000001
+#define CKR_HOST_MEMORY                       0x00000002
+#define CKR_SLOT_ID_INVALID                   0x00000003
+
+/* CKR_FLAGS_INVALID was removed for v2.0 */
+
+/* CKR_GENERAL_ERROR and CKR_FUNCTION_FAILED are new for v2.0 */
+#define CKR_GENERAL_ERROR                     0x00000005
+#define CKR_FUNCTION_FAILED                   0x00000006
+
+/* CKR_ARGUMENTS_BAD, CKR_NO_EVENT, CKR_NEED_TO_CREATE_THREADS,
+ * and CKR_CANT_LOCK are new for v2.01 */
+#define CKR_ARGUMENTS_BAD                     0x00000007
+#define CKR_NO_EVENT                          0x00000008
+#define CKR_NEED_TO_CREATE_THREADS            0x00000009
+#define CKR_CANT_LOCK                         0x0000000A
+
+#define CKR_ATTRIBUTE_READ_ONLY               0x00000010
+#define CKR_ATTRIBUTE_SENSITIVE               0x00000011
+#define CKR_ATTRIBUTE_TYPE_INVALID            0x00000012
+#define CKR_ATTRIBUTE_VALUE_INVALID           0x00000013
+#define CKR_DATA_INVALID                      0x00000020
+#define CKR_DATA_LEN_RANGE                    0x00000021
+#define CKR_DEVICE_ERROR                      0x00000030
+#define CKR_DEVICE_MEMORY                     0x00000031
+#define CKR_DEVICE_REMOVED                    0x00000032
+#define CKR_ENCRYPTED_DATA_INVALID            0x00000040
+#define CKR_ENCRYPTED_DATA_LEN_RANGE          0x00000041
+#define CKR_FUNCTION_CANCELED                 0x00000050
+#define CKR_FUNCTION_NOT_PARALLEL             0x00000051
+
+/* CKR_FUNCTION_NOT_SUPPORTED is new for v2.0 */
+#define CKR_FUNCTION_NOT_SUPPORTED            0x00000054
+
+#define CKR_KEY_HANDLE_INVALID                0x00000060
+
+/* CKR_KEY_SENSITIVE was removed for v2.0 */
+
+#define CKR_KEY_SIZE_RANGE                    0x00000062
+#define CKR_KEY_TYPE_INCONSISTENT             0x00000063
+
+/* CKR_KEY_NOT_NEEDED, CKR_KEY_CHANGED, CKR_KEY_NEEDED,
+ * CKR_KEY_INDIGESTIBLE, CKR_KEY_FUNCTION_NOT_PERMITTED,
+ * CKR_KEY_NOT_WRAPPABLE, and CKR_KEY_UNEXTRACTABLE are new for
+ * v2.0 */
+#define CKR_KEY_NOT_NEEDED                    0x00000064
+#define CKR_KEY_CHANGED                       0x00000065
+#define CKR_KEY_NEEDED                        0x00000066
+#define CKR_KEY_INDIGESTIBLE                  0x00000067
+#define CKR_KEY_FUNCTION_NOT_PERMITTED        0x00000068
+#define CKR_KEY_NOT_WRAPPABLE                 0x00000069
+#define CKR_KEY_UNEXTRACTABLE                 0x0000006A
+
+#define CKR_MECHANISM_INVALID                 0x00000070
+#define CKR_MECHANISM_PARAM_INVALID           0x00000071
+
+/* CKR_OBJECT_CLASS_INCONSISTENT and CKR_OBJECT_CLASS_INVALID
+ * were removed for v2.0 */
+#define CKR_OBJECT_HANDLE_INVALID             0x00000082
+#define CKR_OPERATION_ACTIVE                  0x00000090
+#define CKR_OPERATION_NOT_INITIALIZED         0x00000091
+#define CKR_PIN_INCORRECT                     0x000000A0
+#define CKR_PIN_INVALID                       0x000000A1
+#define CKR_PIN_LEN_RANGE                     0x000000A2
+
+/* CKR_PIN_EXPIRED and CKR_PIN_LOCKED are new for v2.0 */
+#define CKR_PIN_EXPIRED                       0x000000A3
+#define CKR_PIN_LOCKED                        0x000000A4
+
+#define CKR_SESSION_CLOSED                    0x000000B0
+#define CKR_SESSION_COUNT                     0x000000B1
+#define CKR_SESSION_HANDLE_INVALID            0x000000B3
+#define CKR_SESSION_PARALLEL_NOT_SUPPORTED    0x000000B4
+#define CKR_SESSION_READ_ONLY                 0x000000B5
+#define CKR_SESSION_EXISTS                    0x000000B6
+
+/* CKR_SESSION_READ_ONLY_EXISTS and
+ * CKR_SESSION_READ_WRITE_SO_EXISTS are new for v2.0 */
+#define CKR_SESSION_READ_ONLY_EXISTS          0x000000B7
+#define CKR_SESSION_READ_WRITE_SO_EXISTS      0x000000B8
+
+#define CKR_SIGNATURE_INVALID                 0x000000C0
+#define CKR_SIGNATURE_LEN_RANGE               0x000000C1
+#define CKR_TEMPLATE_INCOMPLETE               0x000000D0
+#define CKR_TEMPLATE_INCONSISTENT             0x000000D1
+#define CKR_TOKEN_NOT_PRESENT                 0x000000E0
+#define CKR_TOKEN_NOT_RECOGNIZED              0x000000E1
+#define CKR_TOKEN_WRITE_PROTECTED             0x000000E2
+#define CKR_UNWRAPPING_KEY_HANDLE_INVALID     0x000000F0
+#define CKR_UNWRAPPING_KEY_SIZE_RANGE         0x000000F1
+#define CKR_UNWRAPPING_KEY_TYPE_INCONSISTENT  0x000000F2
+#define CKR_USER_ALREADY_LOGGED_IN            0x00000100
+#define CKR_USER_NOT_LOGGED_IN                0x00000101
+#define CKR_USER_PIN_NOT_INITIALIZED          0x00000102
+#define CKR_USER_TYPE_INVALID                 0x00000103
+
+/* CKR_USER_ANOTHER_ALREADY_LOGGED_IN and CKR_USER_TOO_MANY_TYPES
+ * are new to v2.01 */
+#define CKR_USER_ANOTHER_ALREADY_LOGGED_IN    0x00000104
+#define CKR_USER_TOO_MANY_TYPES               0x00000105
+
+#define CKR_WRAPPED_KEY_INVALID               0x00000110
+#define CKR_WRAPPED_KEY_LEN_RANGE             0x00000112
+#define CKR_WRAPPING_KEY_HANDLE_INVALID       0x00000113
+#define CKR_WRAPPING_KEY_SIZE_RANGE           0x00000114
+#define CKR_WRAPPING_KEY_TYPE_INCONSISTENT    0x00000115
+#define CKR_RANDOM_SEED_NOT_SUPPORTED         0x00000120
+
+/* These are new to v2.0 */
+#define CKR_RANDOM_NO_RNG                     0x00000121
+
+/* These are new to v2.11 */
+#define CKR_DOMAIN_PARAMS_INVALID             0x00000130
+
+/* These are new to v2.0 */
+#define CKR_BUFFER_TOO_SMALL                  0x00000150
+#define CKR_SAVED_STATE_INVALID               0x00000160
+#define CKR_INFORMATION_SENSITIVE             0x00000170
+#define CKR_STATE_UNSAVEABLE                  0x00000180
+
+/* These are new to v2.01 */
+#define CKR_CRYPTOKI_NOT_INITIALIZED          0x00000190
+#define CKR_CRYPTOKI_ALREADY_INITIALIZED      0x00000191
+#define CKR_MUTEX_BAD                         0x000001A0
+#define CKR_MUTEX_NOT_LOCKED                  0x000001A1
+
+/* This is new to v2.20 */
+#define CKR_FUNCTION_REJECTED                 0x00000200
+
+#define CKR_VENDOR_DEFINED                    0x80000000
+
+
+/* CK_NOTIFY is an application callback that processes events */
+typedef CK_CALLBACK_FUNCTION(CK_RV, CK_NOTIFY)(
+					       CK_SESSION_HANDLE hSession,     /* the session's handle */
+					       CK_NOTIFICATION   event,
+					       CK_VOID_PTR       pApplication  /* passed to C_OpenSession */
+					       );
+
+
+/* CK_FUNCTION_LIST is a structure holding a Cryptoki spec
+ * version and pointers of appropriate types to all the
+ * Cryptoki functions */
+/* CK_FUNCTION_LIST is new for v2.0 */
+typedef struct CK_FUNCTION_LIST CK_FUNCTION_LIST;
+
+typedef CK_FUNCTION_LIST CK_PTR CK_FUNCTION_LIST_PTR;
+
+typedef CK_FUNCTION_LIST_PTR CK_PTR CK_FUNCTION_LIST_PTR_PTR;
+
+
+/* CK_CREATEMUTEX is an application callback for creating a
+ * mutex object */
+typedef CK_CALLBACK_FUNCTION(CK_RV, CK_CREATEMUTEX)(
+						    CK_VOID_PTR_PTR ppMutex  /* location to receive ptr to mutex */
+						    );
+
+
+/* CK_DESTROYMUTEX is an application callback for destroying a
+ * mutex object */
+typedef CK_CALLBACK_FUNCTION(CK_RV, CK_DESTROYMUTEX)(
+						     CK_VOID_PTR pMutex  /* pointer to mutex */
+						     );
+
+
+/* CK_LOCKMUTEX is an application callback for locking a mutex */
+typedef CK_CALLBACK_FUNCTION(CK_RV, CK_LOCKMUTEX)(
+						  CK_VOID_PTR pMutex  /* pointer to mutex */
+						  );
+
+
+/* CK_UNLOCKMUTEX is an application callback for unlocking a
+ * mutex */
+typedef CK_CALLBACK_FUNCTION(CK_RV, CK_UNLOCKMUTEX)(
+						    CK_VOID_PTR pMutex  /* pointer to mutex */
+						    );
+
+
+/* CK_C_INITIALIZE_ARGS provides the optional arguments to
+ * C_Initialize */
+typedef struct CK_C_INITIALIZE_ARGS {
+  CK_CREATEMUTEX CreateMutex;
+  CK_DESTROYMUTEX DestroyMutex;
+  CK_LOCKMUTEX LockMutex;
+  CK_UNLOCKMUTEX UnlockMutex;
+  CK_FLAGS flags;
+  CK_VOID_PTR pReserved;
+} CK_C_INITIALIZE_ARGS;
+
+/* flags: bit flags that provide capabilities of the slot
+ *      Bit Flag                           Mask       Meaning
+ */
+#define CKF_LIBRARY_CANT_CREATE_OS_THREADS 0x00000001
+#define CKF_OS_LOCKING_OK                  0x00000002
+
+typedef CK_C_INITIALIZE_ARGS CK_PTR CK_C_INITIALIZE_ARGS_PTR;
+
+
+/* additional flags for parameters to functions */
+
+/* CKF_DONT_BLOCK is for the function C_WaitForSlotEvent */
+#define CKF_DONT_BLOCK     1
+
+/* CK_RSA_PKCS_OAEP_MGF_TYPE is new for v2.10.
+ * CK_RSA_PKCS_OAEP_MGF_TYPE  is used to indicate the Message
+ * Generation Function (MGF) applied to a message block when
+ * formatting a message block for the PKCS #1 OAEP encryption
+ * scheme. */
+typedef CK_ULONG CK_RSA_PKCS_MGF_TYPE;
+
+typedef CK_RSA_PKCS_MGF_TYPE CK_PTR CK_RSA_PKCS_MGF_TYPE_PTR;
+
+/* The following MGFs are defined */
+/* CKG_MGF1_SHA256, CKG_MGF1_SHA384, and CKG_MGF1_SHA512
+ * are new for v2.20 */
+#define CKG_MGF1_SHA1         0x00000001
+#define CKG_MGF1_SHA256       0x00000002
+#define CKG_MGF1_SHA384       0x00000003
+#define CKG_MGF1_SHA512       0x00000004
+
+/* CK_RSA_PKCS_OAEP_SOURCE_TYPE is new for v2.10.
+ * CK_RSA_PKCS_OAEP_SOURCE_TYPE  is used to indicate the source
+ * of the encoding parameter when formatting a message block
+ * for the PKCS #1 OAEP encryption scheme. */
+typedef CK_ULONG CK_RSA_PKCS_OAEP_SOURCE_TYPE;
+
+typedef CK_RSA_PKCS_OAEP_SOURCE_TYPE CK_PTR CK_RSA_PKCS_OAEP_SOURCE_TYPE_PTR;
+
+/* The following encoding parameter sources are defined */
+#define CKZ_DATA_SPECIFIED    0x00000001
+
+/* CK_RSA_PKCS_OAEP_PARAMS is new for v2.10.
+ * CK_RSA_PKCS_OAEP_PARAMS provides the parameters to the
+ * CKM_RSA_PKCS_OAEP mechanism. */
+typedef struct CK_RSA_PKCS_OAEP_PARAMS {
+  CK_MECHANISM_TYPE hashAlg;
+  CK_RSA_PKCS_MGF_TYPE mgf;
+  CK_RSA_PKCS_OAEP_SOURCE_TYPE source;
+  CK_VOID_PTR pSourceData;
+  CK_ULONG ulSourceDataLen;
+} CK_RSA_PKCS_OAEP_PARAMS;
+
+typedef CK_RSA_PKCS_OAEP_PARAMS CK_PTR CK_RSA_PKCS_OAEP_PARAMS_PTR;
+
+/* CK_RSA_PKCS_PSS_PARAMS is new for v2.11.
+ * CK_RSA_PKCS_PSS_PARAMS provides the parameters to the
+ * CKM_RSA_PKCS_PSS mechanism(s). */
+typedef struct CK_RSA_PKCS_PSS_PARAMS {
+  CK_MECHANISM_TYPE    hashAlg;
+  CK_RSA_PKCS_MGF_TYPE mgf;
+  CK_ULONG             sLen;
+} CK_RSA_PKCS_PSS_PARAMS;
+
+typedef CK_RSA_PKCS_PSS_PARAMS CK_PTR CK_RSA_PKCS_PSS_PARAMS_PTR;
+
+/* CK_EC_KDF_TYPE is new for v2.11. */
+typedef CK_ULONG CK_EC_KDF_TYPE;
+
+/* The following EC Key Derivation Functions are defined */
+#define CKD_NULL                 0x00000001
+#define CKD_SHA1_KDF             0x00000002
+
+/* CK_ECDH1_DERIVE_PARAMS is new for v2.11.
+ * CK_ECDH1_DERIVE_PARAMS provides the parameters to the
+ * CKM_ECDH1_DERIVE and CKM_ECDH1_COFACTOR_DERIVE mechanisms,
+ * where each party contributes one key pair.
+ */
+typedef struct CK_ECDH1_DERIVE_PARAMS {
+  CK_EC_KDF_TYPE kdf;
+  CK_ULONG ulSharedDataLen;
+  CK_BYTE_PTR pSharedData;
+  CK_ULONG ulPublicDataLen;
+  CK_BYTE_PTR pPublicData;
+} CK_ECDH1_DERIVE_PARAMS;
+
+typedef CK_ECDH1_DERIVE_PARAMS CK_PTR CK_ECDH1_DERIVE_PARAMS_PTR;
+
+
+/* CK_ECDH2_DERIVE_PARAMS is new for v2.11.
+ * CK_ECDH2_DERIVE_PARAMS provides the parameters to the
+ * CKM_ECMQV_DERIVE mechanism, where each party contributes two key pairs. */
+typedef struct CK_ECDH2_DERIVE_PARAMS {
+  CK_EC_KDF_TYPE kdf;
+  CK_ULONG ulSharedDataLen;
+  CK_BYTE_PTR pSharedData;
+  CK_ULONG ulPublicDataLen;
+  CK_BYTE_PTR pPublicData;
+  CK_ULONG ulPrivateDataLen;
+  CK_OBJECT_HANDLE hPrivateData;
+  CK_ULONG ulPublicDataLen2;
+  CK_BYTE_PTR pPublicData2;
+} CK_ECDH2_DERIVE_PARAMS;
+
+typedef CK_ECDH2_DERIVE_PARAMS CK_PTR CK_ECDH2_DERIVE_PARAMS_PTR;
+
+typedef struct CK_ECMQV_DERIVE_PARAMS {
+  CK_EC_KDF_TYPE kdf;
+  CK_ULONG ulSharedDataLen;
+  CK_BYTE_PTR pSharedData;
+  CK_ULONG ulPublicDataLen;
+  CK_BYTE_PTR pPublicData;
+  CK_ULONG ulPrivateDataLen;
+  CK_OBJECT_HANDLE hPrivateData;
+  CK_ULONG ulPublicDataLen2;
+  CK_BYTE_PTR pPublicData2;
+  CK_OBJECT_HANDLE publicKey;
+} CK_ECMQV_DERIVE_PARAMS;
+
+typedef CK_ECMQV_DERIVE_PARAMS CK_PTR CK_ECMQV_DERIVE_PARAMS_PTR;
+
+/* Typedefs and defines for the CKM_X9_42_DH_KEY_PAIR_GEN and the
+ * CKM_X9_42_DH_PARAMETER_GEN mechanisms (new for PKCS #11 v2.11) */
+typedef CK_ULONG CK_X9_42_DH_KDF_TYPE;
+typedef CK_X9_42_DH_KDF_TYPE CK_PTR CK_X9_42_DH_KDF_TYPE_PTR;
+
+/* The following X9.42 DH key derivation functions are defined
+   (besides CKD_NULL already defined : */
+#define CKD_SHA1_KDF_ASN1        0x00000003
+#define CKD_SHA1_KDF_CONCATENATE 0x00000004
+
+/* CK_X9_42_DH1_DERIVE_PARAMS is new for v2.11.
+ * CK_X9_42_DH1_DERIVE_PARAMS provides the parameters to the
+ * CKM_X9_42_DH_DERIVE key derivation mechanism, where each party
+ * contributes one key pair */
+typedef struct CK_X9_42_DH1_DERIVE_PARAMS {
+  CK_X9_42_DH_KDF_TYPE kdf;
+  CK_ULONG ulOtherInfoLen;
+  CK_BYTE_PTR pOtherInfo;
+  CK_ULONG ulPublicDataLen;
+  CK_BYTE_PTR pPublicData;
+} CK_X9_42_DH1_DERIVE_PARAMS;
+
+typedef struct CK_X9_42_DH1_DERIVE_PARAMS CK_PTR CK_X9_42_DH1_DERIVE_PARAMS_PTR;
+
+/* CK_X9_42_DH2_DERIVE_PARAMS is new for v2.11.
+ * CK_X9_42_DH2_DERIVE_PARAMS provides the parameters to the
+ * CKM_X9_42_DH_HYBRID_DERIVE and CKM_X9_42_MQV_DERIVE key derivation
+ * mechanisms, where each party contributes two key pairs */
+typedef struct CK_X9_42_DH2_DERIVE_PARAMS {
+  CK_X9_42_DH_KDF_TYPE kdf;
+  CK_ULONG ulOtherInfoLen;
+  CK_BYTE_PTR pOtherInfo;
+  CK_ULONG ulPublicDataLen;
+  CK_BYTE_PTR pPublicData;
+  CK_ULONG ulPrivateDataLen;
+  CK_OBJECT_HANDLE hPrivateData;
+  CK_ULONG ulPublicDataLen2;
+  CK_BYTE_PTR pPublicData2;
+} CK_X9_42_DH2_DERIVE_PARAMS;
+
+typedef CK_X9_42_DH2_DERIVE_PARAMS CK_PTR CK_X9_42_DH2_DERIVE_PARAMS_PTR;
+
+typedef struct CK_X9_42_MQV_DERIVE_PARAMS {
+  CK_X9_42_DH_KDF_TYPE kdf;
+  CK_ULONG ulOtherInfoLen;
+  CK_BYTE_PTR pOtherInfo;
+  CK_ULONG ulPublicDataLen;
+  CK_BYTE_PTR pPublicData;
+  CK_ULONG ulPrivateDataLen;
+  CK_OBJECT_HANDLE hPrivateData;
+  CK_ULONG ulPublicDataLen2;
+  CK_BYTE_PTR pPublicData2;
+  CK_OBJECT_HANDLE publicKey;
+} CK_X9_42_MQV_DERIVE_PARAMS;
+
+typedef CK_X9_42_MQV_DERIVE_PARAMS CK_PTR CK_X9_42_MQV_DERIVE_PARAMS_PTR;
+
+/* CK_KEA_DERIVE_PARAMS provides the parameters to the
+ * CKM_KEA_DERIVE mechanism */
+/* CK_KEA_DERIVE_PARAMS is new for v2.0 */
+typedef struct CK_KEA_DERIVE_PARAMS {
+  CK_BBOOL      isSender;
+  CK_ULONG      ulRandomLen;
+  CK_BYTE_PTR   pRandomA;
+  CK_BYTE_PTR   pRandomB;
+  CK_ULONG      ulPublicDataLen;
+  CK_BYTE_PTR   pPublicData;
+} CK_KEA_DERIVE_PARAMS;
+
+typedef CK_KEA_DERIVE_PARAMS CK_PTR CK_KEA_DERIVE_PARAMS_PTR;
+
+
+/* CK_RC2_PARAMS provides the parameters to the CKM_RC2_ECB and
+ * CKM_RC2_MAC mechanisms.  An instance of CK_RC2_PARAMS just
+ * holds the effective keysize */
+typedef CK_ULONG          CK_RC2_PARAMS;
+
+typedef CK_RC2_PARAMS CK_PTR CK_RC2_PARAMS_PTR;
+
+
+/* CK_RC2_CBC_PARAMS provides the parameters to the CKM_RC2_CBC
+ * mechanism */
+typedef struct CK_RC2_CBC_PARAMS {
+  /* ulEffectiveBits was changed from CK_USHORT to CK_ULONG for
+   * v2.0 */
+  CK_ULONG      ulEffectiveBits;  /* effective bits (1-1024) */
+
+  CK_BYTE       iv[8];            /* IV for CBC mode */
+} CK_RC2_CBC_PARAMS;
+
+typedef CK_RC2_CBC_PARAMS CK_PTR CK_RC2_CBC_PARAMS_PTR;
+
+
+/* CK_RC2_MAC_GENERAL_PARAMS provides the parameters for the
+ * CKM_RC2_MAC_GENERAL mechanism */
+/* CK_RC2_MAC_GENERAL_PARAMS is new for v2.0 */
+typedef struct CK_RC2_MAC_GENERAL_PARAMS {
+  CK_ULONG      ulEffectiveBits;  /* effective bits (1-1024) */
+  CK_ULONG      ulMacLength;      /* Length of MAC in bytes */
+} CK_RC2_MAC_GENERAL_PARAMS;
+
+typedef CK_RC2_MAC_GENERAL_PARAMS CK_PTR \
+CK_RC2_MAC_GENERAL_PARAMS_PTR;
+
+
+/* CK_RC5_PARAMS provides the parameters to the CKM_RC5_ECB and
+ * CKM_RC5_MAC mechanisms */
+/* CK_RC5_PARAMS is new for v2.0 */
+typedef struct CK_RC5_PARAMS {
+  CK_ULONG      ulWordsize;  /* wordsize in bits */
+  CK_ULONG      ulRounds;    /* number of rounds */
+} CK_RC5_PARAMS;
+
+typedef CK_RC5_PARAMS CK_PTR CK_RC5_PARAMS_PTR;
+
+
+/* CK_RC5_CBC_PARAMS provides the parameters to the CKM_RC5_CBC
+ * mechanism */
+/* CK_RC5_CBC_PARAMS is new for v2.0 */
+typedef struct CK_RC5_CBC_PARAMS {
+  CK_ULONG      ulWordsize;  /* wordsize in bits */
+  CK_ULONG      ulRounds;    /* number of rounds */
+  CK_BYTE_PTR   pIv;         /* pointer to IV */
+  CK_ULONG      ulIvLen;     /* length of IV in bytes */
+} CK_RC5_CBC_PARAMS;
+
+typedef CK_RC5_CBC_PARAMS CK_PTR CK_RC5_CBC_PARAMS_PTR;
+
+
+/* CK_RC5_MAC_GENERAL_PARAMS provides the parameters for the
+ * CKM_RC5_MAC_GENERAL mechanism */
+/* CK_RC5_MAC_GENERAL_PARAMS is new for v2.0 */
+typedef struct CK_RC5_MAC_GENERAL_PARAMS {
+  CK_ULONG      ulWordsize;   /* wordsize in bits */
+  CK_ULONG      ulRounds;     /* number of rounds */
+  CK_ULONG      ulMacLength;  /* Length of MAC in bytes */
+} CK_RC5_MAC_GENERAL_PARAMS;
+
+typedef CK_RC5_MAC_GENERAL_PARAMS CK_PTR \
+CK_RC5_MAC_GENERAL_PARAMS_PTR;
+
+
+/* CK_MAC_GENERAL_PARAMS provides the parameters to most block
+ * ciphers' MAC_GENERAL mechanisms.  Its value is the length of
+ * the MAC */
+/* CK_MAC_GENERAL_PARAMS is new for v2.0 */
+typedef CK_ULONG          CK_MAC_GENERAL_PARAMS;
+
+typedef CK_MAC_GENERAL_PARAMS CK_PTR CK_MAC_GENERAL_PARAMS_PTR;
+
+/* CK_DES/AES_ECB/CBC_ENCRYPT_DATA_PARAMS are new for v2.20 */
+typedef struct CK_DES_CBC_ENCRYPT_DATA_PARAMS {
+  CK_BYTE      iv[8];
+  CK_BYTE_PTR  pData;
+  CK_ULONG     length;
+} CK_DES_CBC_ENCRYPT_DATA_PARAMS;
+
+typedef CK_DES_CBC_ENCRYPT_DATA_PARAMS CK_PTR CK_DES_CBC_ENCRYPT_DATA_PARAMS_PTR;
+
+typedef struct CK_AES_CBC_ENCRYPT_DATA_PARAMS {
+  CK_BYTE      iv[16];
+  CK_BYTE_PTR  pData;
+  CK_ULONG     length;
+} CK_AES_CBC_ENCRYPT_DATA_PARAMS;
+
+typedef CK_AES_CBC_ENCRYPT_DATA_PARAMS CK_PTR CK_AES_CBC_ENCRYPT_DATA_PARAMS_PTR;
+
+/* CK_SKIPJACK_PRIVATE_WRAP_PARAMS provides the parameters to the
+ * CKM_SKIPJACK_PRIVATE_WRAP mechanism */
+/* CK_SKIPJACK_PRIVATE_WRAP_PARAMS is new for v2.0 */
+typedef struct CK_SKIPJACK_PRIVATE_WRAP_PARAMS {
+  CK_ULONG      ulPasswordLen;
+  CK_BYTE_PTR   pPassword;
+  CK_ULONG      ulPublicDataLen;
+  CK_BYTE_PTR   pPublicData;
+  CK_ULONG      ulPAndGLen;
+  CK_ULONG      ulQLen;
+  CK_ULONG      ulRandomLen;
+  CK_BYTE_PTR   pRandomA;
+  CK_BYTE_PTR   pPrimeP;
+  CK_BYTE_PTR   pBaseG;
+  CK_BYTE_PTR   pSubprimeQ;
+} CK_SKIPJACK_PRIVATE_WRAP_PARAMS;
+
+typedef CK_SKIPJACK_PRIVATE_WRAP_PARAMS CK_PTR \
+CK_SKIPJACK_PRIVATE_WRAP_PTR;
+
+
+/* CK_SKIPJACK_RELAYX_PARAMS provides the parameters to the
+ * CKM_SKIPJACK_RELAYX mechanism */
+/* CK_SKIPJACK_RELAYX_PARAMS is new for v2.0 */
+typedef struct CK_SKIPJACK_RELAYX_PARAMS {
+  CK_ULONG      ulOldWrappedXLen;
+  CK_BYTE_PTR   pOldWrappedX;
+  CK_ULONG      ulOldPasswordLen;
+  CK_BYTE_PTR   pOldPassword;
+  CK_ULONG      ulOldPublicDataLen;
+  CK_BYTE_PTR   pOldPublicData;
+  CK_ULONG      ulOldRandomLen;
+  CK_BYTE_PTR   pOldRandomA;
+  CK_ULONG      ulNewPasswordLen;
+  CK_BYTE_PTR   pNewPassword;
+  CK_ULONG      ulNewPublicDataLen;
+  CK_BYTE_PTR   pNewPublicData;
+  CK_ULONG      ulNewRandomLen;
+  CK_BYTE_PTR   pNewRandomA;
+} CK_SKIPJACK_RELAYX_PARAMS;
+
+typedef CK_SKIPJACK_RELAYX_PARAMS CK_PTR \
+CK_SKIPJACK_RELAYX_PARAMS_PTR;
+
+
+typedef struct CK_PBE_PARAMS {
+  CK_BYTE_PTR      pInitVector;
+  CK_UTF8CHAR_PTR  pPassword;
+  CK_ULONG         ulPasswordLen;
+  CK_BYTE_PTR      pSalt;
+  CK_ULONG         ulSaltLen;
+  CK_ULONG         ulIteration;
+} CK_PBE_PARAMS;
+
+typedef CK_PBE_PARAMS CK_PTR CK_PBE_PARAMS_PTR;
+
+
+/* CK_KEY_WRAP_SET_OAEP_PARAMS provides the parameters to the
+ * CKM_KEY_WRAP_SET_OAEP mechanism */
+/* CK_KEY_WRAP_SET_OAEP_PARAMS is new for v2.0 */
+typedef struct CK_KEY_WRAP_SET_OAEP_PARAMS {
+  CK_BYTE       bBC;     /* block contents byte */
+  CK_BYTE_PTR   pX;      /* extra data */
+  CK_ULONG      ulXLen;  /* length of extra data in bytes */
+} CK_KEY_WRAP_SET_OAEP_PARAMS;
+
+typedef CK_KEY_WRAP_SET_OAEP_PARAMS CK_PTR \
+CK_KEY_WRAP_SET_OAEP_PARAMS_PTR;
+
+
+typedef struct CK_SSL3_RANDOM_DATA {
+  CK_BYTE_PTR  pClientRandom;
+  CK_ULONG     ulClientRandomLen;
+  CK_BYTE_PTR  pServerRandom;
+  CK_ULONG     ulServerRandomLen;
+} CK_SSL3_RANDOM_DATA;
+
+
+typedef struct CK_SSL3_MASTER_KEY_DERIVE_PARAMS {
+  CK_SSL3_RANDOM_DATA RandomInfo;
+  CK_VERSION_PTR pVersion;
+} CK_SSL3_MASTER_KEY_DERIVE_PARAMS;
+
+typedef struct CK_SSL3_MASTER_KEY_DERIVE_PARAMS CK_PTR \
+CK_SSL3_MASTER_KEY_DERIVE_PARAMS_PTR;
+
+
+typedef struct CK_SSL3_KEY_MAT_OUT {
+  CK_OBJECT_HANDLE hClientMacSecret;
+  CK_OBJECT_HANDLE hServerMacSecret;
+  CK_OBJECT_HANDLE hClientKey;
+  CK_OBJECT_HANDLE hServerKey;
+  CK_BYTE_PTR      pIVClient;
+  CK_BYTE_PTR      pIVServer;
+} CK_SSL3_KEY_MAT_OUT;
+
+typedef CK_SSL3_KEY_MAT_OUT CK_PTR CK_SSL3_KEY_MAT_OUT_PTR;
+
+
+typedef struct CK_SSL3_KEY_MAT_PARAMS {
+  CK_ULONG                ulMacSizeInBits;
+  CK_ULONG                ulKeySizeInBits;
+  CK_ULONG                ulIVSizeInBits;
+  CK_BBOOL                bIsExport;
+  CK_SSL3_RANDOM_DATA     RandomInfo;
+  CK_SSL3_KEY_MAT_OUT_PTR pReturnedKeyMaterial;
+} CK_SSL3_KEY_MAT_PARAMS;
+
+typedef CK_SSL3_KEY_MAT_PARAMS CK_PTR CK_SSL3_KEY_MAT_PARAMS_PTR;
+
+/* CK_TLS_PRF_PARAMS is new for version 2.20 */
+typedef struct CK_TLS_PRF_PARAMS {
+  CK_BYTE_PTR  pSeed;
+  CK_ULONG     ulSeedLen;
+  CK_BYTE_PTR  pLabel;
+  CK_ULONG     ulLabelLen;
+  CK_BYTE_PTR  pOutput;
+  CK_ULONG_PTR pulOutputLen;
+} CK_TLS_PRF_PARAMS;
+
+typedef CK_TLS_PRF_PARAMS CK_PTR CK_TLS_PRF_PARAMS_PTR;
+
+/* WTLS is new for version 2.20 */
+typedef struct CK_WTLS_RANDOM_DATA {
+  CK_BYTE_PTR pClientRandom;
+  CK_ULONG    ulClientRandomLen;
+  CK_BYTE_PTR pServerRandom;
+  CK_ULONG    ulServerRandomLen;
+} CK_WTLS_RANDOM_DATA;
+
+typedef CK_WTLS_RANDOM_DATA CK_PTR CK_WTLS_RANDOM_DATA_PTR;
+
+typedef struct CK_WTLS_MASTER_KEY_DERIVE_PARAMS {
+  CK_MECHANISM_TYPE   DigestMechanism;
+  CK_WTLS_RANDOM_DATA RandomInfo;
+  CK_BYTE_PTR         pVersion;
+} CK_WTLS_MASTER_KEY_DERIVE_PARAMS;
+
+typedef CK_WTLS_MASTER_KEY_DERIVE_PARAMS CK_PTR \
+CK_WTLS_MASTER_KEY_DERIVE_PARAMS_PTR;
+
+typedef struct CK_WTLS_PRF_PARAMS {
+  CK_MECHANISM_TYPE DigestMechanism;
+  CK_BYTE_PTR       pSeed;
+  CK_ULONG          ulSeedLen;
+  CK_BYTE_PTR       pLabel;
+  CK_ULONG          ulLabelLen;
+  CK_BYTE_PTR       pOutput;
+  CK_ULONG_PTR      pulOutputLen;
+} CK_WTLS_PRF_PARAMS;
+
+typedef CK_WTLS_PRF_PARAMS CK_PTR CK_WTLS_PRF_PARAMS_PTR;
+
+typedef struct CK_WTLS_KEY_MAT_OUT {
+  CK_OBJECT_HANDLE hMacSecret;
+  CK_OBJECT_HANDLE hKey;
+  CK_BYTE_PTR      pIV;
+} CK_WTLS_KEY_MAT_OUT;
+
+typedef CK_WTLS_KEY_MAT_OUT CK_PTR CK_WTLS_KEY_MAT_OUT_PTR;
+
+typedef struct CK_WTLS_KEY_MAT_PARAMS {
+  CK_MECHANISM_TYPE       DigestMechanism;
+  CK_ULONG                ulMacSizeInBits;
+  CK_ULONG                ulKeySizeInBits;
+  CK_ULONG                ulIVSizeInBits;
+  CK_ULONG                ulSequenceNumber;
+  CK_BBOOL                bIsExport;
+  CK_WTLS_RANDOM_DATA     RandomInfo;
+  CK_WTLS_KEY_MAT_OUT_PTR pReturnedKeyMaterial;
+} CK_WTLS_KEY_MAT_PARAMS;
+
+typedef CK_WTLS_KEY_MAT_PARAMS CK_PTR CK_WTLS_KEY_MAT_PARAMS_PTR;
+
+/* CMS is new for version 2.20 */
+typedef struct CK_CMS_SIG_PARAMS {
+  CK_OBJECT_HANDLE      certificateHandle;
+  CK_MECHANISM_PTR      pSigningMechanism;
+  CK_MECHANISM_PTR      pDigestMechanism;
+  CK_UTF8CHAR_PTR       pContentType;
+  CK_BYTE_PTR           pRequestedAttributes;
+  CK_ULONG              ulRequestedAttributesLen;
+  CK_BYTE_PTR           pRequiredAttributes;
+  CK_ULONG              ulRequiredAttributesLen;
+} CK_CMS_SIG_PARAMS;
+
+typedef CK_CMS_SIG_PARAMS CK_PTR CK_CMS_SIG_PARAMS_PTR;
+
+typedef struct CK_KEY_DERIVATION_STRING_DATA {
+  CK_BYTE_PTR pData;
+  CK_ULONG    ulLen;
+} CK_KEY_DERIVATION_STRING_DATA;
+
+typedef CK_KEY_DERIVATION_STRING_DATA CK_PTR \
+CK_KEY_DERIVATION_STRING_DATA_PTR;
+
+
+/* The CK_EXTRACT_PARAMS is used for the
+ * CKM_EXTRACT_KEY_FROM_KEY mechanism.  It specifies which bit
+ * of the base key should be used as the first bit of the
+ * derived key */
+/* CK_EXTRACT_PARAMS is new for v2.0 */
+typedef CK_ULONG CK_EXTRACT_PARAMS;
+
+typedef CK_EXTRACT_PARAMS CK_PTR CK_EXTRACT_PARAMS_PTR;
+
+/* CK_PKCS5_PBKD2_PSEUDO_RANDOM_FUNCTION_TYPE is new for v2.10.
+ * CK_PKCS5_PBKD2_PSEUDO_RANDOM_FUNCTION_TYPE is used to
+ * indicate the Pseudo-Random Function (PRF) used to generate
+ * key bits using PKCS #5 PBKDF2. */
+typedef CK_ULONG CK_PKCS5_PBKD2_PSEUDO_RANDOM_FUNCTION_TYPE;
+
+typedef CK_PKCS5_PBKD2_PSEUDO_RANDOM_FUNCTION_TYPE CK_PTR CK_PKCS5_PBKD2_PSEUDO_RANDOM_FUNCTION_TYPE_PTR;
+
+/* The following PRFs are defined in PKCS #5 v2.0. */
+#define CKP_PKCS5_PBKD2_HMAC_SHA1 0x00000001
+
+
+/* CK_PKCS5_PBKDF2_SALT_SOURCE_TYPE is new for v2.10.
+ * CK_PKCS5_PBKDF2_SALT_SOURCE_TYPE is used to indicate the
+ * source of the salt value when deriving a key using PKCS #5
+ * PBKDF2. */
+typedef CK_ULONG CK_PKCS5_PBKDF2_SALT_SOURCE_TYPE;
+
+typedef CK_PKCS5_PBKDF2_SALT_SOURCE_TYPE CK_PTR CK_PKCS5_PBKDF2_SALT_SOURCE_TYPE_PTR;
+
+/* The following salt value sources are defined in PKCS #5 v2.0. */
+#define CKZ_SALT_SPECIFIED        0x00000001
+
+/* CK_PKCS5_PBKD2_PARAMS is new for v2.10.
+ * CK_PKCS5_PBKD2_PARAMS is a structure that provides the
+ * parameters to the CKM_PKCS5_PBKD2 mechanism. */
+typedef struct CK_PKCS5_PBKD2_PARAMS {
+  CK_PKCS5_PBKDF2_SALT_SOURCE_TYPE           saltSource;
+  CK_VOID_PTR                                pSaltSourceData;
+  CK_ULONG                                   ulSaltSourceDataLen;
+  CK_ULONG                                   iterations;
+  CK_PKCS5_PBKD2_PSEUDO_RANDOM_FUNCTION_TYPE prf;
+  CK_VOID_PTR                                pPrfData;
+  CK_ULONG                                   ulPrfDataLen;
+  CK_UTF8CHAR_PTR                            pPassword;
+  CK_ULONG_PTR                               ulPasswordLen;
+} CK_PKCS5_PBKD2_PARAMS;
+
+typedef CK_PKCS5_PBKD2_PARAMS CK_PTR CK_PKCS5_PBKD2_PARAMS_PTR;
+
+#endif
