mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-22 18:19:42 +00:00
Code Issues Releases Wiki Activity

[master] update pkcs11 headers

Browse Source 
4353.	[cleanup]	Update PKCS#11 header files. [RT #42175]
This commit is contained in:
Evan Hunt 2016-05-04 15:55:03 -07:00
parent 66074f152f
commit 699f790c49
21 changed files with 1341 additions and 1226 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES
View File

@ -1,3 +1,5 @@
4353. [cleanup] Update PKCS#11 header files. [RT #42175]
4352. [cleanup] The ISC DNSSEC Lookaside Validation (DLV) service 4352. [cleanup] The ISC DNSSEC Lookaside Validation (DLV) service
is scheduled to be disabled in 2017. A warning is is scheduled to be disabled in 2017. A warning is
now logged when named is configured to use it, now logged when named is configured to use it,

10
bin/tests/pkcs11/benchmarks/create.c
View File

@ -56,6 +56,7 @@
#include <isc/print.h> #include <isc/print.h>
#include <isc/result.h> #include <isc/result.h>
#include <isc/types.h> #include <isc/types.h>
#include <isc/util.h>
#include <pk11/pk11.h> #include <pk11/pk11.h>
#include <pk11/result.h> #include <pk11/result.h>
@ -65,16 +66,23 @@
#endif #endif
#ifndef HAVE_CLOCK_GETTIME #ifndef HAVE_CLOCK_GETTIME
#include <sys/time.h>
#ifndef CLOCK_REALTIME #ifndef CLOCK_REALTIME
#define CLOCK_REALTIME 0 #define CLOCK_REALTIME 0
#endif #endif
int static int clock_gettime(int32_t id, struct timespec *tp);
static int
clock_gettime(int32_t id, struct timespec *tp) clock_gettime(int32_t id, struct timespec *tp)
{ {
struct timeval tv; struct timeval tv;
int result; int result;
UNUSED(id);
result = gettimeofday(&tv, NULL); result = gettimeofday(&tv, NULL);
if (result) if (result)
return (result); return (result);

10
bin/tests/pkcs11/benchmarks/find.c
View File

@ -54,6 +54,7 @@
#include <isc/print.h> #include <isc/print.h>
#include <isc/result.h> #include <isc/result.h>
#include <isc/types.h> #include <isc/types.h>
#include <isc/util.h>
#include <pk11/pk11.h> #include <pk11/pk11.h>
#include <pk11/result.h> #include <pk11/result.h>
@ -63,16 +64,23 @@
#endif #endif
#ifndef HAVE_CLOCK_GETTIME #ifndef HAVE_CLOCK_GETTIME
#include <sys/time.h>
#ifndef CLOCK_REALTIME #ifndef CLOCK_REALTIME
#define CLOCK_REALTIME 0 #define CLOCK_REALTIME 0
#endif #endif
int static int clock_gettime(int32_t id, struct timespec *tp);
static int
clock_gettime(int32_t id, struct timespec *tp) clock_gettime(int32_t id, struct timespec *tp)
{ {
struct timeval tv; struct timeval tv;
int result; int result;
UNUSED(id);
result = gettimeofday(&tv, NULL); result = gettimeofday(&tv, NULL);
if (result) if (result)
return (result); return (result);

10
bin/tests/pkcs11/benchmarks/genrsa.c
View File

@ -56,6 +56,7 @@
#include <isc/print.h> #include <isc/print.h>
#include <isc/result.h> #include <isc/result.h>
#include <isc/types.h> #include <isc/types.h>
#include <isc/util.h>
#include <pk11/pk11.h> #include <pk11/pk11.h>
#include <pk11/result.h> #include <pk11/result.h>
@ -65,16 +66,23 @@
#endif #endif
#ifndef HAVE_CLOCK_GETTIME #ifndef HAVE_CLOCK_GETTIME
#include <sys/time.h>
#ifndef CLOCK_REALTIME #ifndef CLOCK_REALTIME
#define CLOCK_REALTIME 0 #define CLOCK_REALTIME 0
#endif #endif
int static int clock_gettime(int32_t id, struct timespec *tp);
static int
clock_gettime(int32_t id, struct timespec *tp) clock_gettime(int32_t id, struct timespec *tp)
{ {
struct timeval tv; struct timeval tv;
int result; int result;
UNUSED(id);
result = gettimeofday(&tv, NULL); result = gettimeofday(&tv, NULL);
if (result) if (result)
return (result); return (result);

10
bin/tests/pkcs11/benchmarks/login.c
View File

@ -56,6 +56,7 @@
#include <isc/print.h> #include <isc/print.h>
#include <isc/result.h> #include <isc/result.h>
#include <isc/types.h> #include <isc/types.h>
#include <isc/util.h>
#include <pk11/pk11.h> #include <pk11/pk11.h>
#include <pk11/internal.h> #include <pk11/internal.h>
@ -65,16 +66,23 @@
#endif #endif
#ifndef HAVE_CLOCK_GETTIME #ifndef HAVE_CLOCK_GETTIME
#include <sys/time.h>
#ifndef CLOCK_REALTIME #ifndef CLOCK_REALTIME
#define CLOCK_REALTIME 0 #define CLOCK_REALTIME 0
#endif #endif
int static int clock_gettime(int32_t id, struct timespec *tp);
static int
clock_gettime(int32_t id, struct timespec *tp) clock_gettime(int32_t id, struct timespec *tp)
{ {
struct timeval tv; struct timeval tv;
int result; int result;
UNUSED(id);
result = gettimeofday(&tv, NULL); result = gettimeofday(&tv, NULL);
if (result) if (result)
return (result); return (result);

10
bin/tests/pkcs11/benchmarks/privrsa.c
View File

@ -56,6 +56,7 @@
#include <isc/print.h> #include <isc/print.h>
#include <isc/result.h> #include <isc/result.h>
#include <isc/types.h> #include <isc/types.h>
#include <isc/util.h>
#include <pk11/pk11.h> #include <pk11/pk11.h>
#include <pk11/result.h> #include <pk11/result.h>
@ -65,16 +66,23 @@
#endif #endif
#ifndef HAVE_CLOCK_GETTIME #ifndef HAVE_CLOCK_GETTIME
#include <sys/time.h>
#ifndef CLOCK_REALTIME #ifndef CLOCK_REALTIME
#define CLOCK_REALTIME 0 #define CLOCK_REALTIME 0
#endif #endif
int static int clock_gettime(int32_t id, struct timespec *tp);
static int
clock_gettime(int32_t id, struct timespec *tp) clock_gettime(int32_t id, struct timespec *tp)
{ {
struct timeval tv; struct timeval tv;
int result; int result;
UNUSED(id);
result = gettimeofday(&tv, NULL); result = gettimeofday(&tv, NULL);
if (result) if (result)
return (result); return (result);

10
bin/tests/pkcs11/benchmarks/pubrsa.c
View File

@ -56,6 +56,7 @@
#include <isc/print.h> #include <isc/print.h>
#include <isc/result.h> #include <isc/result.h>
#include <isc/types.h> #include <isc/types.h>
#include <isc/util.h>
#include <pk11/pk11.h> #include <pk11/pk11.h>
#include <pk11/result.h> #include <pk11/result.h>
@ -65,16 +66,23 @@
#endif #endif
#ifndef HAVE_CLOCK_GETTIME #ifndef HAVE_CLOCK_GETTIME
#include <sys/time.h>
#ifndef CLOCK_REALTIME #ifndef CLOCK_REALTIME
#define CLOCK_REALTIME 0 #define CLOCK_REALTIME 0
#endif #endif
int static int clock_gettime(int32_t id, struct timespec *tp);
static int
clock_gettime(int32_t id, struct timespec *tp) clock_gettime(int32_t id, struct timespec *tp)
{ {
struct timeval tv; struct timeval tv;
int result; int result;
UNUSED(id);
result = gettimeofday(&tv, NULL); result = gettimeofday(&tv, NULL);
if (result) if (result)
return (result); return (result);

10
bin/tests/pkcs11/benchmarks/random.c
View File

@ -56,21 +56,29 @@
#include <isc/print.h> #include <isc/print.h>
#include <isc/result.h> #include <isc/result.h>
#include <isc/types.h> #include <isc/types.h>
#include <isc/util.h>
#include <pk11/pk11.h> #include <pk11/pk11.h>
#include <pk11/result.h> #include <pk11/result.h>
#ifndef HAVE_CLOCK_GETTIME #ifndef HAVE_CLOCK_GETTIME
#include <sys/time.h>
#ifndef CLOCK_REALTIME #ifndef CLOCK_REALTIME
#define CLOCK_REALTIME 0 #define CLOCK_REALTIME 0
#endif #endif
int static int clock_gettime(int32_t id, struct timespec *tp);
static int
clock_gettime(int32_t id, struct timespec *tp) clock_gettime(int32_t id, struct timespec *tp)
{ {
struct timeval tv; struct timeval tv;
int result; int result;
UNUSED(id);
result = gettimeofday(&tv, NULL); result = gettimeofday(&tv, NULL);
if (result) if (result)
return (result); return (result);

10
bin/tests/pkcs11/benchmarks/session.c
View File

@ -56,21 +56,29 @@
#include <isc/print.h> #include <isc/print.h>
#include <isc/result.h> #include <isc/result.h>
#include <isc/types.h> #include <isc/types.h>
#include <isc/util.h>
#include <pk11/pk11.h> #include <pk11/pk11.h>
#include <pk11/internal.h> #include <pk11/internal.h>
#ifndef HAVE_CLOCK_GETTIME #ifndef HAVE_CLOCK_GETTIME
#include <sys/time.h>
#ifndef CLOCK_REALTIME #ifndef CLOCK_REALTIME
#define CLOCK_REALTIME 0 #define CLOCK_REALTIME 0
#endif #endif
int static int clock_gettime(int32_t id, struct timespec *tp);
static int
clock_gettime(int32_t id, struct timespec *tp) clock_gettime(int32_t id, struct timespec *tp)
{ {
struct timeval tv; struct timeval tv;
int result; int result;
UNUSED(id);
result = gettimeofday(&tv, NULL); result = gettimeofday(&tv, NULL);
if (result) if (result)
return (result); return (result);

10
bin/tests/pkcs11/benchmarks/sha1.c
View File

@ -56,21 +56,29 @@
#include <isc/print.h> #include <isc/print.h>
#include <isc/result.h> #include <isc/result.h>
#include <isc/types.h> #include <isc/types.h>
#include <isc/util.h>
#include <pk11/pk11.h> #include <pk11/pk11.h>
#include <pk11/result.h> #include <pk11/result.h>
#ifndef HAVE_CLOCK_GETTIME #ifndef HAVE_CLOCK_GETTIME
#include <sys/time.h>
#ifndef CLOCK_REALTIME #ifndef CLOCK_REALTIME
#define CLOCK_REALTIME 0 #define CLOCK_REALTIME 0
#endif #endif
int static int clock_gettime(int32_t id, struct timespec *tp);
static int
clock_gettime(int32_t id, struct timespec *tp) clock_gettime(int32_t id, struct timespec *tp)
{ {
struct timeval tv; struct timeval tv;
int result; int result;
UNUSED(id);
result = gettimeofday(&tv, NULL); result = gettimeofday(&tv, NULL);
if (result) if (result)
return (result); return (result);

10
bin/tests/pkcs11/benchmarks/sign.c
View File

@ -56,6 +56,7 @@
#include <isc/print.h> #include <isc/print.h>
#include <isc/result.h> #include <isc/result.h>
#include <isc/types.h> #include <isc/types.h>
#include <isc/util.h>
#include <pk11/pk11.h> #include <pk11/pk11.h>
#include <pk11/result.h> #include <pk11/result.h>
@ -65,16 +66,23 @@
#endif #endif
#ifndef HAVE_CLOCK_GETTIME #ifndef HAVE_CLOCK_GETTIME
#include <sys/time.h>
#ifndef CLOCK_REALTIME #ifndef CLOCK_REALTIME
#define CLOCK_REALTIME 0 #define CLOCK_REALTIME 0
#endif #endif
int static int clock_gettime(int32_t id, struct timespec *tp);
static int
clock_gettime(int32_t id, struct timespec *tp) clock_gettime(int32_t id, struct timespec *tp)
{ {
struct timeval tv; struct timeval tv;
int result; int result;
UNUSED(id);
result = gettimeofday(&tv, NULL); result = gettimeofday(&tv, NULL);
if (result) if (result)
return (result); return (result);

10
bin/tests/pkcs11/benchmarks/verify.c
View File

@ -56,6 +56,7 @@
#include <isc/print.h> #include <isc/print.h>
#include <isc/result.h> #include <isc/result.h>
#include <isc/types.h> #include <isc/types.h>
#include <isc/util.h>
#include <pk11/pk11.h> #include <pk11/pk11.h>
#include <pk11/result.h> #include <pk11/result.h>
@ -65,16 +66,23 @@
#endif #endif
#ifndef HAVE_CLOCK_GETTIME #ifndef HAVE_CLOCK_GETTIME
#include <sys/time.h>
#ifndef CLOCK_REALTIME #ifndef CLOCK_REALTIME
#define CLOCK_REALTIME 0 #define CLOCK_REALTIME 0
#endif #endif
int static int clock_gettime(int32_t id, struct timespec *tp);
static int
clock_gettime(int32_t id, struct timespec *tp) clock_gettime(int32_t id, struct timespec *tp)
{ {
struct timeval tv; struct timeval tv;
int result; int result;
UNUSED(id);
result = gettimeofday(&tv, NULL); result = gettimeofday(&tv, NULL);
if (result) if (result)
return (result); return (result);

3
lib/dns/pkcs11dh_link.c
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2014, 2015 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2014-2016 Internet Systems Consortium, Inc. ("ISC")
* *
* Permission to use, copy, modify, and/or distribute this software for any * Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above * purpose with or without fee is hereby granted, provided that the above
@ -21,6 +21,7 @@
#include <ctype.h> #include <ctype.h>
#include <isc/mem.h> #include <isc/mem.h>
#include <isc/safe.h>
#include <isc/string.h> #include <isc/string.h>
#include <isc/util.h> #include <isc/util.h>

3
lib/dns/pkcs11dsa_link.c
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2014, 2015 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2014-2016 Internet Systems Consortium, Inc. ("ISC")
* *
* Permission to use, copy, modify, and/or distribute this software for any * Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above * purpose with or without fee is hereby granted, provided that the above
@ -22,6 +22,7 @@
#include <isc/entropy.h> #include <isc/entropy.h>
#include <isc/mem.h> #include <isc/mem.h>
#include <isc/safe.h>
#include <isc/sha1.h> #include <isc/sha1.h>
#include <isc/util.h> #include <isc/util.h>

3
lib/dns/pkcs11ecdsa_link.c
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2014, 2015 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2014-2016 Internet Systems Consortium, Inc. ("ISC")
* *
* Permission to use, copy, modify, and/or distribute this software for any * Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above * purpose with or without fee is hereby granted, provided that the above
@ -20,6 +20,7 @@
#include <isc/entropy.h> #include <isc/entropy.h>
#include <isc/mem.h> #include <isc/mem.h>
#include <isc/safe.h>
#include <isc/sha2.h> #include <isc/sha2.h>
#include <isc/string.h> #include <isc/string.h>
#include <isc/util.h> #include <isc/util.h>

3
lib/dns/pkcs11gost_link.c
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2014, 2015 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2014-2016 Internet Systems Consortium, Inc. ("ISC")
* *
* Permission to use, copy, modify, and/or distribute this software for any * Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above * purpose with or without fee is hereby granted, provided that the above
@ -20,6 +20,7 @@
#include <isc/entropy.h> #include <isc/entropy.h>
#include <isc/mem.h> #include <isc/mem.h>
#include <isc/safe.h>
#include <isc/sha2.h> #include <isc/sha2.h>
#include <isc/string.h> #include <isc/string.h>
#include <isc/util.h> #include <isc/util.h>

3
lib/dns/pkcs11rsa_link.c
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2014, 2015 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2014-2016 Internet Systems Consortium, Inc. ("ISC")
* *
* Permission to use, copy, modify, and/or distribute this software for any * Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above * purpose with or without fee is hereby granted, provided that the above
@ -25,6 +25,7 @@
#include <isc/sha1.h> #include <isc/sha1.h>
#include <isc/sha2.h> #include <isc/sha2.h>
#include <isc/mem.h> #include <isc/mem.h>
#include <isc/safe.h>
#include <isc/string.h> #include <isc/string.h>
#include <isc/util.h> #include <isc/util.h>

85
lib/isc/include/pkcs11/pkcs11.h
View File

@ -1,19 +1,11 @@
/* pkcs11.h include file for PKCS #11. */ /*
/* $Revision: 1.2 $ */ * PKCS #11 Cryptographic Token Interface Base Specification Version 2.40 Errata 01
* Committee Specification Draft 01 / Public Review Draft 01
/* License to copy and use this software is granted provided that it is * 09 December 2015
* identified as "RSA Security Inc. PKCS #11 Cryptographic Token Interface * Copyright (c) OASIS Open 2015. All Rights Reserved.
* (Cryptoki)" in all material mentioning or referencing this software. * Source: http://docs.oasis-open.org/pkcs11/pkcs11-base/v2.40/errata01/csprd01/include/pkcs11-v2.40/
* Latest version of the specification: http://docs.oasis-open.org/pkcs11/pkcs11-base/v2.40/pkcs11-base-v2.40.html
* License is also granted to make and use derivative works provided that * https://www.oasis-open.org/policies-guidelines/ipr
* 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_ #ifndef _PKCS11_H_
@ -24,14 +16,14 @@ extern "C" {
#endif #endif
/* Before including this file (pkcs11.h) (or pkcs11t.h by /* Before including this file (pkcs11.h) (or pkcs11t.h by
* itself), 6 platform-specific macros must be defined. These * itself), 5 platform-specific macros must be defined. These
* macros are described below, and typical definitions for them * macros are described below, and typical definitions for them
* are also given. Be advised that these definitions can depend * are also given. Be advised that these definitions can depend
* on both the platform and the compiler used (and possibly also * on both the platform and the compiler used (and possibly also
* on whether a Cryptoki library is linked statically or * on whether a Cryptoki library is linked statically or
* dynamically). * dynamically).
* *
* In addition to defining these 6 macros, the packing convention * In addition to defining these 5 macros, the packing convention
* for Cryptoki structures should be set. The Cryptoki * for Cryptoki structures should be set. The Cryptoki
* convention on packing is that structures should be 1-byte * convention on packing is that structures should be 1-byte
* aligned. * aligned.
@ -81,39 +73,7 @@ extern "C" {
* #define CK_PTR * * #define CK_PTR *
* *
* *
* 2. CK_DEFINE_FUNCTION(returnType, name): A macro which makes * 2. CK_DECLARE_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 * an importable Cryptoki library function declaration out of a
* return type and a function name. It should be used in the * return type and a function name. It should be used in the
* following fashion: * following fashion:
@ -141,7 +101,7 @@ extern "C" {
* returnType name * returnType name
* *
* *
* 4. CK_DECLARE_FUNCTION_POINTER(returnType, name): A macro * 3. CK_DECLARE_FUNCTION_POINTER(returnType, name): A macro
* which makes a Cryptoki API function pointer declaration or * which makes a Cryptoki API function pointer declaration or
* function pointer type declaration out of a return type and a * function pointer type declaration out of a return type and a
* function name. It should be used in the following fashion: * function name. It should be used in the following fashion:
@ -178,7 +138,7 @@ extern "C" {
* returnType (* name) * returnType (* name)
* *
* *
* 5. CK_CALLBACK_FUNCTION(returnType, name): A macro which makes * 4. CK_CALLBACK_FUNCTION(returnType, name): A macro which makes
* a function pointer type for an application callback out of * a function pointer type for an application callback out of
* a return type for the callback and a name for the callback. * a return type for the callback and a name for the callback.
* It should be used in the following fashion: * It should be used in the following fashion:
@ -210,7 +170,7 @@ extern "C" {
* returnType (* name) * returnType (* name)
* *
* *
* 6. NULL_PTR: This macro is the value of a NULL pointer. * 5. NULL_PTR: This macro is the value of a NULL pointer.
* *
* In any ANSI/ISO C environment (and in many others as well), * In any ANSI/ISO C environment (and in many others as well),
* this should best be defined by * this should best be defined by
@ -222,7 +182,8 @@ extern "C" {
/* All the various Cryptoki types and #define'd values are in the /* All the various Cryptoki types and #define'd values are in the
* file pkcs11t.h. */ * file pkcs11t.h.
*/
#include "pkcs11t.h" #include "pkcs11t.h"
#define __PASTE(x,y) x##y #define __PASTE(x,y) x##y
@ -238,7 +199,8 @@ extern "C" {
extern CK_DECLARE_FUNCTION(CK_RV, name) extern CK_DECLARE_FUNCTION(CK_RV, name)
/* pkcs11f.h has all the information about the Cryptoki /* pkcs11f.h has all the information about the Cryptoki
* function prototypes. */ * function prototypes.
*/
#include "pkcs11f.h" #include "pkcs11f.h"
#undef CK_NEED_ARG_LIST #undef CK_NEED_ARG_LIST
@ -257,7 +219,8 @@ extern "C" {
typedef CK_DECLARE_FUNCTION_POINTER(CK_RV, __PASTE(CK_,name)) typedef CK_DECLARE_FUNCTION_POINTER(CK_RV, __PASTE(CK_,name))
/* pkcs11f.h has all the information about the Cryptoki /* pkcs11f.h has all the information about the Cryptoki
* function prototypes. */ * function prototypes.
*/
#include "pkcs11f.h" #include "pkcs11f.h"
#undef CK_NEED_ARG_LIST #undef CK_NEED_ARG_LIST
@ -275,14 +238,15 @@ extern "C" {
#define CK_PKCS11_FUNCTION_INFO(name) \ #define CK_PKCS11_FUNCTION_INFO(name) \
__PASTE(CK_,name) name; __PASTE(CK_,name) name;
struct CK_FUNCTION_LIST { struct CK_FUNCTION_LIST {
CK_VERSION version; /* Cryptoki version */ CK_VERSION version; /* Cryptoki version */
/* Pile all the function pointers into the CK_FUNCTION_LIST. */ /* Pile all the function pointers into the CK_FUNCTION_LIST. */
/* pkcs11f.h has all the information about the Cryptoki /* pkcs11f.h has all the information about the Cryptoki
* function prototypes. */ * function prototypes.
*/
#include "pkcs11f.h" #include "pkcs11f.h"
}; };
@ -296,4 +260,5 @@ struct CK_FUNCTION_LIST {
} }
#endif #endif
#endif #endif /* _PKCS11_H_ */

226
lib/isc/include/pkcs11/pkcs11f.h
View File

@ -1,26 +1,19 @@
/* pkcs11f.h include file for PKCS #11. */ /*
/* $Revision: 1.2 $ */ * PKCS #11 Cryptographic Token Interface Base Specification Version 2.40 Errata 01
* Committee Specification Draft 01 / Public Review Draft 01
/* License to copy and use this software is granted provided that it is * 09 December 2015
* identified as "RSA Security Inc. PKCS #11 Cryptographic Token Interface * Copyright (c) OASIS Open 2015. All Rights Reserved.
* (Cryptoki)" in all material mentioning or referencing this software. * Source: http://docs.oasis-open.org/pkcs11/pkcs11-base/v2.40/errata01/csprd01/include/pkcs11-v2.40/
* Latest version of the specification: http://docs.oasis-open.org/pkcs11/pkcs11-base/v2.40/pkcs11-base-v2.40.html
* License is also granted to make and use derivative works provided that * https://www.oasis-open.org/policies-guidelines/ipr
* 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 */ /* This header file contains pretty much everything about all the
/* Cryptoki function prototypes. Because this information is */ * Cryptoki function prototypes. Because this information is
/* used for more than just declaring function prototypes, the */ * used for more than just declaring function prototypes, the
/* order of the functions appearing herein is important, and */ * order of the functions appearing herein is important, and
/* should not be altered. */ * should not be altered.
*/
/* General-purpose */ /* General-purpose */
@ -30,13 +23,15 @@ CK_PKCS11_FUNCTION_INFO(C_Initialize)
( (
CK_VOID_PTR pInitArgs /* if this is not NULL_PTR, it gets CK_VOID_PTR pInitArgs /* if this is not NULL_PTR, it gets
* cast to CK_C_INITIALIZE_ARGS_PTR * cast to CK_C_INITIALIZE_ARGS_PTR
* and dereferenced */ * and dereferenced
*/
); );
#endif #endif
/* C_Finalize indicates that an application is done with the /* C_Finalize indicates that an application is done with the
* Cryptoki library. */ * Cryptoki library.
*/
CK_PKCS11_FUNCTION_INFO(C_Finalize) CK_PKCS11_FUNCTION_INFO(C_Finalize)
#ifdef CK_NEED_ARG_LIST #ifdef CK_NEED_ARG_LIST
( (
@ -59,7 +54,8 @@ CK_PKCS11_FUNCTION_INFO(C_GetFunctionList)
#ifdef CK_NEED_ARG_LIST #ifdef CK_NEED_ARG_LIST
( (
CK_FUNCTION_LIST_PTR_PTR ppFunctionList /* receives pointer to CK_FUNCTION_LIST_PTR_PTR ppFunctionList /* receives pointer to
* function list */ * function list
*/
); );
#endif #endif
@ -71,7 +67,7 @@ CK_PKCS11_FUNCTION_INFO(C_GetFunctionList)
CK_PKCS11_FUNCTION_INFO(C_GetSlotList) CK_PKCS11_FUNCTION_INFO(C_GetSlotList)
#ifdef CK_NEED_ARG_LIST #ifdef CK_NEED_ARG_LIST
( (
CK_BBOOL tokenPresent, /* only slots with tokens? */ CK_BBOOL tokenPresent, /* only slots with tokens */
CK_SLOT_ID_PTR pSlotList, /* receives array of slot IDs */ CK_SLOT_ID_PTR pSlotList, /* receives array of slot IDs */
CK_ULONG_PTR pulCount /* receives number of slots */ CK_ULONG_PTR pulCount /* receives number of slots */
); );
@ -79,7 +75,8 @@ CK_PKCS11_FUNCTION_INFO(C_GetSlotList)
/* C_GetSlotInfo obtains information about a particular slot in /* C_GetSlotInfo obtains information about a particular slot in
* the system. */ * the system.
*/
CK_PKCS11_FUNCTION_INFO(C_GetSlotInfo) CK_PKCS11_FUNCTION_INFO(C_GetSlotInfo)
#ifdef CK_NEED_ARG_LIST #ifdef CK_NEED_ARG_LIST
( (
@ -90,7 +87,8 @@ CK_PKCS11_FUNCTION_INFO(C_GetSlotInfo)
/* C_GetTokenInfo obtains information about a particular token /* C_GetTokenInfo obtains information about a particular token
* in the system. */ * in the system.
*/
CK_PKCS11_FUNCTION_INFO(C_GetTokenInfo) CK_PKCS11_FUNCTION_INFO(C_GetTokenInfo)
#ifdef CK_NEED_ARG_LIST #ifdef CK_NEED_ARG_LIST
( (
@ -101,7 +99,8 @@ CK_PKCS11_FUNCTION_INFO(C_GetTokenInfo)
/* C_GetMechanismList obtains a list of mechanism types /* C_GetMechanismList obtains a list of mechanism types
* supported by a token. */ * supported by a token.
*/
CK_PKCS11_FUNCTION_INFO(C_GetMechanismList) CK_PKCS11_FUNCTION_INFO(C_GetMechanismList)
#ifdef CK_NEED_ARG_LIST #ifdef CK_NEED_ARG_LIST
( (
@ -113,7 +112,8 @@ CK_PKCS11_FUNCTION_INFO(C_GetMechanismList)
/* C_GetMechanismInfo obtains information about a particular /* C_GetMechanismInfo obtains information about a particular
* mechanism possibly supported by a token. */ * mechanism possibly supported by a token.
*/
CK_PKCS11_FUNCTION_INFO(C_GetMechanismInfo) CK_PKCS11_FUNCTION_INFO(C_GetMechanismInfo)
#ifdef CK_NEED_ARG_LIST #ifdef CK_NEED_ARG_LIST
( (
@ -127,7 +127,6 @@ CK_PKCS11_FUNCTION_INFO(C_GetMechanismInfo)
/* C_InitToken initializes a token. */ /* C_InitToken initializes a token. */
CK_PKCS11_FUNCTION_INFO(C_InitToken) CK_PKCS11_FUNCTION_INFO(C_InitToken)
#ifdef CK_NEED_ARG_LIST #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_SLOT_ID slotID, /* ID of the token's slot */
CK_UTF8CHAR_PTR pPin, /* the SO's initial PIN */ CK_UTF8CHAR_PTR pPin, /* the SO's initial PIN */
@ -165,7 +164,8 @@ CK_PKCS11_FUNCTION_INFO(C_SetPIN)
/* Session management */ /* Session management */
/* C_OpenSession opens a session between an application and a /* C_OpenSession opens a session between an application and a
* token. */ * token.
*/
CK_PKCS11_FUNCTION_INFO(C_OpenSession) CK_PKCS11_FUNCTION_INFO(C_OpenSession)
#ifdef CK_NEED_ARG_LIST #ifdef CK_NEED_ARG_LIST
( (
@ -179,7 +179,8 @@ CK_PKCS11_FUNCTION_INFO(C_OpenSession)
/* C_CloseSession closes a session between an application and a /* C_CloseSession closes a session between an application and a
* token. */ * token.
*/
CK_PKCS11_FUNCTION_INFO(C_CloseSession) CK_PKCS11_FUNCTION_INFO(C_CloseSession)
#ifdef CK_NEED_ARG_LIST #ifdef CK_NEED_ARG_LIST
( (
@ -208,7 +209,8 @@ CK_PKCS11_FUNCTION_INFO(C_GetSessionInfo)
/* C_GetOperationState obtains the state of the cryptographic operation /* C_GetOperationState obtains the state of the cryptographic operation
* in a session. */ * in a session.
*/
CK_PKCS11_FUNCTION_INFO(C_GetOperationState) CK_PKCS11_FUNCTION_INFO(C_GetOperationState)
#ifdef CK_NEED_ARG_LIST #ifdef CK_NEED_ARG_LIST
( (
@ -220,7 +222,8 @@ CK_PKCS11_FUNCTION_INFO(C_GetOperationState)
/* C_SetOperationState restores the state of the cryptographic /* C_SetOperationState restores the state of the cryptographic
* operation in a session. */ * operation in a session.
*/
CK_PKCS11_FUNCTION_INFO(C_SetOperationState) CK_PKCS11_FUNCTION_INFO(C_SetOperationState)
#ifdef CK_NEED_ARG_LIST #ifdef CK_NEED_ARG_LIST
( (
@ -270,7 +273,8 @@ CK_PKCS11_FUNCTION_INFO(C_CreateObject)
/* C_CopyObject copies an object, creating a new object for the /* C_CopyObject copies an object, creating a new object for the
* copy. */ * copy.
*/
CK_PKCS11_FUNCTION_INFO(C_CopyObject) CK_PKCS11_FUNCTION_INFO(C_CopyObject)
#ifdef CK_NEED_ARG_LIST #ifdef CK_NEED_ARG_LIST
( (
@ -305,7 +309,8 @@ CK_PKCS11_FUNCTION_INFO(C_GetObjectSize)
/* C_GetAttributeValue obtains the value of one or more object /* C_GetAttributeValue obtains the value of one or more object
* attributes. */ * attributes.
*/
CK_PKCS11_FUNCTION_INFO(C_GetAttributeValue) CK_PKCS11_FUNCTION_INFO(C_GetAttributeValue)
#ifdef CK_NEED_ARG_LIST #ifdef CK_NEED_ARG_LIST
( (
@ -318,7 +323,8 @@ CK_PKCS11_FUNCTION_INFO(C_GetAttributeValue)
/* C_SetAttributeValue modifies the value of one or more object /* C_SetAttributeValue modifies the value of one or more object
* attributes */ * attributes.
*/
CK_PKCS11_FUNCTION_INFO(C_SetAttributeValue) CK_PKCS11_FUNCTION_INFO(C_SetAttributeValue)
#ifdef CK_NEED_ARG_LIST #ifdef CK_NEED_ARG_LIST
( (
@ -331,7 +337,8 @@ CK_PKCS11_FUNCTION_INFO(C_SetAttributeValue)
/* C_FindObjectsInit initializes a search for token and session /* C_FindObjectsInit initializes a search for token and session
* objects that match a template. */ * objects that match a template.
*/
CK_PKCS11_FUNCTION_INFO(C_FindObjectsInit) CK_PKCS11_FUNCTION_INFO(C_FindObjectsInit)
#ifdef CK_NEED_ARG_LIST #ifdef CK_NEED_ARG_LIST
( (
@ -344,7 +351,8 @@ CK_PKCS11_FUNCTION_INFO(C_FindObjectsInit)
/* C_FindObjects continues a search for token and session /* C_FindObjects continues a search for token and session
* objects that match a template, obtaining additional object * objects that match a template, obtaining additional object
* handles. */ * handles.
*/
CK_PKCS11_FUNCTION_INFO(C_FindObjects) CK_PKCS11_FUNCTION_INFO(C_FindObjects)
#ifdef CK_NEED_ARG_LIST #ifdef CK_NEED_ARG_LIST
( (
@ -357,7 +365,8 @@ CK_PKCS11_FUNCTION_INFO(C_FindObjects)
/* C_FindObjectsFinal finishes a search for token and session /* C_FindObjectsFinal finishes a search for token and session
* objects. */ * objects.
*/
CK_PKCS11_FUNCTION_INFO(C_FindObjectsFinal) CK_PKCS11_FUNCTION_INFO(C_FindObjectsFinal)
#ifdef CK_NEED_ARG_LIST #ifdef CK_NEED_ARG_LIST
( (
@ -394,7 +403,8 @@ CK_PKCS11_FUNCTION_INFO(C_Encrypt)
/* C_EncryptUpdate continues a multiple-part encryption /* C_EncryptUpdate continues a multiple-part encryption
* operation. */ * operation.
*/
CK_PKCS11_FUNCTION_INFO(C_EncryptUpdate) CK_PKCS11_FUNCTION_INFO(C_EncryptUpdate)
#ifdef CK_NEED_ARG_LIST #ifdef CK_NEED_ARG_LIST
( (
@ -408,7 +418,8 @@ CK_PKCS11_FUNCTION_INFO(C_EncryptUpdate)
/* C_EncryptFinal finishes a multiple-part encryption /* C_EncryptFinal finishes a multiple-part encryption
* operation. */ * operation.
*/
CK_PKCS11_FUNCTION_INFO(C_EncryptFinal) CK_PKCS11_FUNCTION_INFO(C_EncryptFinal)
#ifdef CK_NEED_ARG_LIST #ifdef CK_NEED_ARG_LIST
( (
@ -444,7 +455,8 @@ CK_PKCS11_FUNCTION_INFO(C_Decrypt)
/* C_DecryptUpdate continues a multiple-part decryption /* C_DecryptUpdate continues a multiple-part decryption
* operation. */ * operation.
*/
CK_PKCS11_FUNCTION_INFO(C_DecryptUpdate) CK_PKCS11_FUNCTION_INFO(C_DecryptUpdate)
#ifdef CK_NEED_ARG_LIST #ifdef CK_NEED_ARG_LIST
( (
@ -458,7 +470,8 @@ CK_PKCS11_FUNCTION_INFO(C_DecryptUpdate)
/* C_DecryptFinal finishes a multiple-part decryption /* C_DecryptFinal finishes a multiple-part decryption
* operation. */ * operation.
*/
CK_PKCS11_FUNCTION_INFO(C_DecryptFinal) CK_PKCS11_FUNCTION_INFO(C_DecryptFinal)
#ifdef CK_NEED_ARG_LIST #ifdef CK_NEED_ARG_LIST
( (
@ -496,7 +509,8 @@ CK_PKCS11_FUNCTION_INFO(C_Digest)
/* C_DigestUpdate continues a multiple-part message-digesting /* C_DigestUpdate continues a multiple-part message-digesting
* operation. */ * operation.
*/
CK_PKCS11_FUNCTION_INFO(C_DigestUpdate) CK_PKCS11_FUNCTION_INFO(C_DigestUpdate)
#ifdef CK_NEED_ARG_LIST #ifdef CK_NEED_ARG_LIST
( (
@ -509,7 +523,8 @@ CK_PKCS11_FUNCTION_INFO(C_DigestUpdate)
/* C_DigestKey continues a multi-part message-digesting /* C_DigestKey continues a multi-part message-digesting
* operation, by digesting the value of a secret key as part of * operation, by digesting the value of a secret key as part of
* the data already digested. */ * the data already digested.
*/
CK_PKCS11_FUNCTION_INFO(C_DigestKey) CK_PKCS11_FUNCTION_INFO(C_DigestKey)
#ifdef CK_NEED_ARG_LIST #ifdef CK_NEED_ARG_LIST
( (
@ -520,7 +535,8 @@ CK_PKCS11_FUNCTION_INFO(C_DigestKey)
/* C_DigestFinal finishes a multiple-part message-digesting /* C_DigestFinal finishes a multiple-part message-digesting
* operation. */ * operation.
*/
CK_PKCS11_FUNCTION_INFO(C_DigestFinal) CK_PKCS11_FUNCTION_INFO(C_DigestFinal)
#ifdef CK_NEED_ARG_LIST #ifdef CK_NEED_ARG_LIST
( (
@ -537,7 +553,8 @@ CK_PKCS11_FUNCTION_INFO(C_DigestFinal)
/* C_SignInit initializes a signature (private key encryption) /* C_SignInit initializes a signature (private key encryption)
* operation, where the signature is (will be) an appendix to * operation, where the signature is (will be) an appendix to
* the data, and plaintext cannot be recovered from the * the data, and plaintext cannot be recovered from the
*signature. */ * signature.
*/
CK_PKCS11_FUNCTION_INFO(C_SignInit) CK_PKCS11_FUNCTION_INFO(C_SignInit)
#ifdef CK_NEED_ARG_LIST #ifdef CK_NEED_ARG_LIST
( (
@ -550,7 +567,8 @@ CK_PKCS11_FUNCTION_INFO(C_SignInit)
/* C_Sign signs (encrypts with private key) data in a single /* C_Sign signs (encrypts with private key) data in a single
* part, where the signature is (will be) an appendix to the * part, where the signature is (will be) an appendix to the
* data, and plaintext cannot be recovered from the signature. */ * data, and plaintext cannot be recovered from the signature.
*/
CK_PKCS11_FUNCTION_INFO(C_Sign) CK_PKCS11_FUNCTION_INFO(C_Sign)
#ifdef CK_NEED_ARG_LIST #ifdef CK_NEED_ARG_LIST
( (
@ -564,8 +582,9 @@ CK_PKCS11_FUNCTION_INFO(C_Sign)
/* C_SignUpdate continues a multiple-part signature operation, /* C_SignUpdate continues a multiple-part signature operation,
* where the signature is (will be) an appendix to the data, * where the signature is (will be) an appendix to the data,
* and plaintext cannot be recovered from the signature. */ * and plaintext cannot be recovered from the signature.
*/
CK_PKCS11_FUNCTION_INFO(C_SignUpdate) CK_PKCS11_FUNCTION_INFO(C_SignUpdate)
#ifdef CK_NEED_ARG_LIST #ifdef CK_NEED_ARG_LIST
( (
@ -576,8 +595,9 @@ CK_PKCS11_FUNCTION_INFO(C_SignUpdate)
#endif #endif
/* C_SignFinal finishes a multiple-part signature operation, /* C_SignFinal finishes a multiple-part signature operation,
* returning the signature. */ * returning the signature.
*/
CK_PKCS11_FUNCTION_INFO(C_SignFinal) CK_PKCS11_FUNCTION_INFO(C_SignFinal)
#ifdef CK_NEED_ARG_LIST #ifdef CK_NEED_ARG_LIST
( (
@ -589,7 +609,8 @@ CK_PKCS11_FUNCTION_INFO(C_SignFinal)
/* C_SignRecoverInit initializes a signature operation, where /* C_SignRecoverInit initializes a signature operation, where
* the data can be recovered from the signature. */ * the data can be recovered from the signature.
*/
CK_PKCS11_FUNCTION_INFO(C_SignRecoverInit) CK_PKCS11_FUNCTION_INFO(C_SignRecoverInit)
#ifdef CK_NEED_ARG_LIST #ifdef CK_NEED_ARG_LIST
( (
@ -601,7 +622,8 @@ CK_PKCS11_FUNCTION_INFO(C_SignRecoverInit)
/* C_SignRecover signs data in a single operation, where the /* C_SignRecover signs data in a single operation, where the
* data can be recovered from the signature. */ * data can be recovered from the signature.
*/
CK_PKCS11_FUNCTION_INFO(C_SignRecover) CK_PKCS11_FUNCTION_INFO(C_SignRecover)
#ifdef CK_NEED_ARG_LIST #ifdef CK_NEED_ARG_LIST
( (
@ -619,20 +641,22 @@ CK_PKCS11_FUNCTION_INFO(C_SignRecover)
/* C_VerifyInit initializes a verification operation, where the /* C_VerifyInit initializes a verification operation, where the
* signature is an appendix to the data, and plaintext cannot * signature is an appendix to the data, and plaintext cannot
* cannot be recovered from the signature (e.g. DSA). */ * cannot be recovered from the signature (e.g. DSA).
*/
CK_PKCS11_FUNCTION_INFO(C_VerifyInit) CK_PKCS11_FUNCTION_INFO(C_VerifyInit)
#ifdef CK_NEED_ARG_LIST #ifdef CK_NEED_ARG_LIST
( (
CK_SESSION_HANDLE hSession, /* the session's handle */ CK_SESSION_HANDLE hSession, /* the session's handle */
CK_MECHANISM_PTR pMechanism, /* the verification mechanism */ CK_MECHANISM_PTR pMechanism, /* the verification mechanism */
CK_OBJECT_HANDLE hKey /* verification key */ CK_OBJECT_HANDLE hKey /* verification key */
); );
#endif #endif
/* C_Verify verifies a signature in a single-part operation, /* C_Verify verifies a signature in a single-part operation,
* where the signature is an appendix to the data, and plaintext * where the signature is an appendix to the data, and plaintext
* cannot be recovered from the signature. */ * cannot be recovered from the signature.
*/
CK_PKCS11_FUNCTION_INFO(C_Verify) CK_PKCS11_FUNCTION_INFO(C_Verify)
#ifdef CK_NEED_ARG_LIST #ifdef CK_NEED_ARG_LIST
( (
@ -646,8 +670,9 @@ CK_PKCS11_FUNCTION_INFO(C_Verify)
/* C_VerifyUpdate continues a multiple-part verification /* C_VerifyUpdate continues a multiple-part verification
* operation, where the signature is an appendix to the data, * operation, where the signature is an appendix to the data,
* and plaintext cannot be recovered from the signature. */ * and plaintext cannot be recovered from the signature.
*/
CK_PKCS11_FUNCTION_INFO(C_VerifyUpdate) CK_PKCS11_FUNCTION_INFO(C_VerifyUpdate)
#ifdef CK_NEED_ARG_LIST #ifdef CK_NEED_ARG_LIST
( (
@ -659,7 +684,8 @@ CK_PKCS11_FUNCTION_INFO(C_VerifyUpdate)
/* C_VerifyFinal finishes a multiple-part verification /* C_VerifyFinal finishes a multiple-part verification
* operation, checking the signature. */ * operation, checking the signature.
*/
CK_PKCS11_FUNCTION_INFO(C_VerifyFinal) CK_PKCS11_FUNCTION_INFO(C_VerifyFinal)
#ifdef CK_NEED_ARG_LIST #ifdef CK_NEED_ARG_LIST
( (
@ -671,7 +697,8 @@ CK_PKCS11_FUNCTION_INFO(C_VerifyFinal)
/* C_VerifyRecoverInit initializes a signature verification /* C_VerifyRecoverInit initializes a signature verification
* operation, where the data is recovered from the signature. */ * operation, where the data is recovered from the signature.
*/
CK_PKCS11_FUNCTION_INFO(C_VerifyRecoverInit) CK_PKCS11_FUNCTION_INFO(C_VerifyRecoverInit)
#ifdef CK_NEED_ARG_LIST #ifdef CK_NEED_ARG_LIST
( (
@ -683,7 +710,8 @@ CK_PKCS11_FUNCTION_INFO(C_VerifyRecoverInit)
/* C_VerifyRecover verifies a signature in a single-part /* C_VerifyRecover verifies a signature in a single-part
* operation, where the data is recovered from the signature. */ * operation, where the data is recovered from the signature.
*/
CK_PKCS11_FUNCTION_INFO(C_VerifyRecover) CK_PKCS11_FUNCTION_INFO(C_VerifyRecover)
#ifdef CK_NEED_ARG_LIST #ifdef CK_NEED_ARG_LIST
( (
@ -700,7 +728,8 @@ CK_PKCS11_FUNCTION_INFO(C_VerifyRecover)
/* Dual-function cryptographic operations */ /* Dual-function cryptographic operations */
/* C_DigestEncryptUpdate continues a multiple-part digesting /* C_DigestEncryptUpdate continues a multiple-part digesting
* and encryption operation. */ * and encryption operation.
*/
CK_PKCS11_FUNCTION_INFO(C_DigestEncryptUpdate) CK_PKCS11_FUNCTION_INFO(C_DigestEncryptUpdate)
#ifdef CK_NEED_ARG_LIST #ifdef CK_NEED_ARG_LIST
( (
@ -714,7 +743,8 @@ CK_PKCS11_FUNCTION_INFO(C_DigestEncryptUpdate)
/* C_DecryptDigestUpdate continues a multiple-part decryption and /* C_DecryptDigestUpdate continues a multiple-part decryption and
* digesting operation. */ * digesting operation.
*/
CK_PKCS11_FUNCTION_INFO(C_DecryptDigestUpdate) CK_PKCS11_FUNCTION_INFO(C_DecryptDigestUpdate)
#ifdef CK_NEED_ARG_LIST #ifdef CK_NEED_ARG_LIST
( (
@ -728,7 +758,8 @@ CK_PKCS11_FUNCTION_INFO(C_DecryptDigestUpdate)
/* C_SignEncryptUpdate continues a multiple-part signing and /* C_SignEncryptUpdate continues a multiple-part signing and
* encryption operation. */ * encryption operation.
*/
CK_PKCS11_FUNCTION_INFO(C_SignEncryptUpdate) CK_PKCS11_FUNCTION_INFO(C_SignEncryptUpdate)
#ifdef CK_NEED_ARG_LIST #ifdef CK_NEED_ARG_LIST
( (
@ -742,7 +773,8 @@ CK_PKCS11_FUNCTION_INFO(C_SignEncryptUpdate)
/* C_DecryptVerifyUpdate continues a multiple-part decryption and /* C_DecryptVerifyUpdate continues a multiple-part decryption and
* verify operation. */ * verify operation.
*/
CK_PKCS11_FUNCTION_INFO(C_DecryptVerifyUpdate) CK_PKCS11_FUNCTION_INFO(C_DecryptVerifyUpdate)
#ifdef CK_NEED_ARG_LIST #ifdef CK_NEED_ARG_LIST
( (
@ -759,7 +791,8 @@ CK_PKCS11_FUNCTION_INFO(C_DecryptVerifyUpdate)
/* Key management */ /* Key management */
/* C_GenerateKey generates a secret key, creating a new key /* C_GenerateKey generates a secret key, creating a new key
* object. */ * object.
*/
CK_PKCS11_FUNCTION_INFO(C_GenerateKey) CK_PKCS11_FUNCTION_INFO(C_GenerateKey)
#ifdef CK_NEED_ARG_LIST #ifdef CK_NEED_ARG_LIST
( (
@ -772,31 +805,20 @@ CK_PKCS11_FUNCTION_INFO(C_GenerateKey)
#endif #endif
/* C_GenerateKeyPair generates a public-key/private-key pair, /* C_GenerateKeyPair generates a public-key/private-key pair,
* creating new key objects. */ * creating new key objects.
*/
CK_PKCS11_FUNCTION_INFO(C_GenerateKeyPair) CK_PKCS11_FUNCTION_INFO(C_GenerateKeyPair)
#ifdef CK_NEED_ARG_LIST #ifdef CK_NEED_ARG_LIST
( (
CK_SESSION_HANDLE hSession, /* session CK_SESSION_HANDLE hSession, /* session handle */
* handle */ CK_MECHANISM_PTR pMechanism, /* key-gen mech. */
CK_MECHANISM_PTR pMechanism, /* key-gen CK_ATTRIBUTE_PTR pPublicKeyTemplate, /* template for pub. key */
* mech. */ CK_ULONG ulPublicKeyAttributeCount, /* # pub. attrs. */
CK_ATTRIBUTE_PTR pPublicKeyTemplate, /* template CK_ATTRIBUTE_PTR pPrivateKeyTemplate, /* template for priv. key */
* for pub. CK_ULONG ulPrivateKeyAttributeCount, /* # priv. attrs. */
* key */ CK_OBJECT_HANDLE_PTR phPublicKey, /* gets pub. key handle */
CK_ULONG ulPublicKeyAttributeCount, /* # pub. CK_OBJECT_HANDLE_PTR phPrivateKey /* gets priv. key handle */
* 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 #endif
@ -816,7 +838,8 @@ CK_PKCS11_FUNCTION_INFO(C_WrapKey)
/* C_UnwrapKey unwraps (decrypts) a wrapped key, creating a new /* C_UnwrapKey unwraps (decrypts) a wrapped key, creating a new
* key object. */ * key object.
*/
CK_PKCS11_FUNCTION_INFO(C_UnwrapKey) CK_PKCS11_FUNCTION_INFO(C_UnwrapKey)
#ifdef CK_NEED_ARG_LIST #ifdef CK_NEED_ARG_LIST
( (
@ -833,7 +856,8 @@ CK_PKCS11_FUNCTION_INFO(C_UnwrapKey)
/* C_DeriveKey derives a key from a base key, creating a new key /* C_DeriveKey derives a key from a base key, creating a new key
* object. */ * object.
*/
CK_PKCS11_FUNCTION_INFO(C_DeriveKey) CK_PKCS11_FUNCTION_INFO(C_DeriveKey)
#ifdef CK_NEED_ARG_LIST #ifdef CK_NEED_ARG_LIST
( (
@ -851,7 +875,8 @@ CK_PKCS11_FUNCTION_INFO(C_DeriveKey)
/* Random number generation */ /* Random number generation */
/* C_SeedRandom mixes additional seed material into the token's /* C_SeedRandom mixes additional seed material into the token's
* random number generator. */ * random number generator.
*/
CK_PKCS11_FUNCTION_INFO(C_SeedRandom) CK_PKCS11_FUNCTION_INFO(C_SeedRandom)
#ifdef CK_NEED_ARG_LIST #ifdef CK_NEED_ARG_LIST
( (
@ -878,7 +903,8 @@ CK_PKCS11_FUNCTION_INFO(C_GenerateRandom)
/* C_GetFunctionStatus is a legacy function; it obtains an /* C_GetFunctionStatus is a legacy function; it obtains an
* updated status of a function running in parallel with an * updated status of a function running in parallel with an
* application. */ * application.
*/
CK_PKCS11_FUNCTION_INFO(C_GetFunctionStatus) CK_PKCS11_FUNCTION_INFO(C_GetFunctionStatus)
#ifdef CK_NEED_ARG_LIST #ifdef CK_NEED_ARG_LIST
( (
@ -888,7 +914,8 @@ CK_PKCS11_FUNCTION_INFO(C_GetFunctionStatus)
/* C_CancelFunction is a legacy function; it cancels a function /* C_CancelFunction is a legacy function; it cancels a function
* running in parallel. */ * running in parallel.
*/
CK_PKCS11_FUNCTION_INFO(C_CancelFunction) CK_PKCS11_FUNCTION_INFO(C_CancelFunction)
#ifdef CK_NEED_ARG_LIST #ifdef CK_NEED_ARG_LIST
( (
@ -897,11 +924,9 @@ CK_PKCS11_FUNCTION_INFO(C_CancelFunction)
#endif #endif
/* Functions added in for Cryptoki Version 2.01 or later */
/* C_WaitForSlotEvent waits for a slot event (token insertion, /* C_WaitForSlotEvent waits for a slot event (token insertion,
* removal, etc.) to occur. */ * removal, etc.) to occur.
*/
CK_PKCS11_FUNCTION_INFO(C_WaitForSlotEvent) CK_PKCS11_FUNCTION_INFO(C_WaitForSlotEvent)
#ifdef CK_NEED_ARG_LIST #ifdef CK_NEED_ARG_LIST
( (
@ -910,3 +935,4 @@ CK_PKCS11_FUNCTION_INFO(C_WaitForSlotEvent)
CK_VOID_PTR pRserved /* reserved. Should be NULL_PTR */ CK_VOID_PTR pRserved /* reserved. Should be NULL_PTR */
); );
#endif #endif

2119
lib/isc/include/pkcs11/pkcs11t.h
View File

File diff suppressed because it is too large Load Diff

10
util/copyrights
View File

@ -3482,11 +3482,11 @@
./lib/dns/order.c C 2002,2004,2005,2007,2015 ./lib/dns/order.c C 2002,2004,2005,2007,2015
./lib/dns/peer.c C 2000,2001,2003,2004,2005,2006,2007,2008,2009,2012,2013,2014,2015 ./lib/dns/peer.c C 2000,2001,2003,2004,2005,2006,2007,2008,2009,2012,2013,2014,2015
./lib/dns/pkcs11.c C 2014 ./lib/dns/pkcs11.c C 2014
./lib/dns/pkcs11dh_link.c C 2014,2015 ./lib/dns/pkcs11dh_link.c C 2014,2015,2016
./lib/dns/pkcs11dsa_link.c C 2014,2015 ./lib/dns/pkcs11dsa_link.c C 2014,2015,2016
./lib/dns/pkcs11ecdsa_link.c C 2014,2015 ./lib/dns/pkcs11ecdsa_link.c C 2014,2015,2016
./lib/dns/pkcs11gost_link.c C 2014,2015 ./lib/dns/pkcs11gost_link.c C 2014,2015,2016
./lib/dns/pkcs11rsa_link.c C 2014,2015 ./lib/dns/pkcs11rsa_link.c C 2014,2015,2016
./lib/dns/portlist.c C 2003,2004,2005,2006,2007,2014 ./lib/dns/portlist.c C 2003,2004,2005,2006,2007,2014
./lib/dns/private.c C 2009,2011,2012,2015 ./lib/dns/private.c C 2009,2011,2012,2015
./lib/dns/rbt.c C 1999,2000,2001,2002,2003,2004,2005,2007,2008,2009,2011,2012,2013,2014,2015,2016 ./lib/dns/rbt.c C 1999,2000,2001,2002,2003,2004,2005,2007,2008,2009,2011,2012,2013,2014,2015,2016