Skip to content

Commit 0d14d96

Browse files
committed
pkc11 3.1
1 parent abd19f9 commit 0d14d96

File tree

3 files changed

+289
-120
lines changed

3 files changed

+289
-120
lines changed

pkcs11/pkcs11.h

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,26 @@
1-
/* Copyright (c) OASIS Open 2016-2020. All Rights Reserved.
2-
* Distributed under the terms of the OASIS IPR Policy,
1+
/*
2+
* PKCS #11 Specification Version 3.1
3+
* Committee Specification Draft 01
4+
* 16 February 2022
5+
* Copyright (c) OASIS Open 2022. All Rights Reserved.
6+
* Source:
7+
* https://docs.oasis-open.org/pkcs11/pkcs11-spec/v3.1/csd01/include/pkcs11-v3.1/
8+
* Latest stage of narrative specification:
9+
* https://docs.oasis-open.org/pkcs11/pkcs11-spec/v3.1/pkcs11-spec-v3.1.html TC
10+
* IPR Statement: https://www.oasis-open.org/committees/pkcs11/ipr.php
11+
*/
12+
13+
/* Copyright (c) OASIS Open 2016,2019. All Rights Reserved./
14+
* /Distributed under the terms of the OASIS IPR Policy,
315
* [http://www.oasis-open.org/policies-guidelines/ipr], AS-IS, WITHOUT ANY
416
* IMPLIED OR EXPRESS WARRANTY; there is no warranty of MERCHANTABILITY, FITNESS
517
* FOR A PARTICULAR PURPOSE or NONINFRINGEMENT of the rights of others.
618
*/
719

20+
/* Latest version of the specification:
21+
* http://docs.oasis-open.org/pkcs11/pkcs11-base/v3.0/pkcs11-base-v3.0.html
22+
*/
23+
824
#ifndef _PKCS11_H_
925
#define _PKCS11_H_ 1
1026

@@ -47,7 +63,7 @@ extern "C" {
4763
*
4864
* typedef CK_BYTE CK_PTR CK_BYTE_PTR;
4965
*
50-
* If you're using windows, it might be defined by:
66+
* If you're using Windows, it might be defined by:
5167
*
5268
* #define CK_PTR *
5369
*
@@ -65,7 +81,7 @@ extern "C" {
6581
* CK_VOID_PTR pReserved
6682
* );
6783
*
68-
* If you're using Windows to declare a function in a Win32 cryptoki .dll,
84+
* If you're using Windows to declare a function in a Win32 Cryptoki .dll,
6985
* it might be defined by:
7086
*
7187
* #define CK_DECLARE_FUNCTION(returnType, name) \

pkcs11/pkcs11f.h

Lines changed: 25 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,26 @@
1-
/* Copyright (c) OASIS Open 2016-2020. All Rights Reserved.
1+
/*
2+
* PKCS #11 Specification Version 3.1
3+
* Committee Specification Draft 01
4+
* 16 February 2022
5+
* Copyright (c) OASIS Open 2022. All Rights Reserved.
6+
* Source:
7+
* https://docs.oasis-open.org/pkcs11/pkcs11-spec/v3.1/csd01/include/pkcs11-v3.1/
8+
* Latest stage of narrative specification:
9+
* https://docs.oasis-open.org/pkcs11/pkcs11-spec/v3.1/pkcs11-spec-v3.1.html TC
10+
* IPR Statement: https://www.oasis-open.org/committees/pkcs11/ipr.php
11+
*/
12+
13+
/* Copyright (c) OASIS Open 2016, 2019. All Rights Reserved./
214
* /Distributed under the terms of the OASIS IPR Policy,
315
* [http://www.oasis-open.org/policies-guidelines/ipr], AS-IS, WITHOUT ANY
416
* IMPLIED OR EXPRESS WARRANTY; there is no warranty of MERCHANTABILITY, FITNESS
517
* FOR A PARTICULAR PURPOSE or NONINFRINGEMENT of the rights of others.
618
*/
719

20+
/* Latest version of the specification:
21+
* http://docs.oasis-open.org/pkcs11/pkcs11-base/v2.40/pkcs11-base-v2.40.html
22+
*/
23+
824
/* This header file contains pretty much everything about all the
925
* Cryptoki function prototypes. Because this information is
1026
* used for more than just declaring function prototypes, the
@@ -910,14 +926,14 @@ CK_PKCS11_FUNCTION_INFO(C_DecryptMessageBegin)
910926

911927
CK_PKCS11_FUNCTION_INFO(C_DecryptMessageNext)
912928
#ifdef CK_NEED_ARG_LIST
913-
(CK_SESSION_HANDLE hSession, /* the session's handle */
914-
CK_VOID_PTR pParameter, /* message specific parameter */
915-
CK_ULONG ulParameterLen, /* length of message specific parameter */
916-
CK_BYTE_PTR pCiphertext, /* cipher text */
917-
CK_ULONG ulCiphertextLen, /* cipher text length */
918-
CK_BYTE_PTR pPlaintext, /* gets plain text */
919-
CK_ULONG_PTR pulPlaintextLen, /* gets plain text length */
920-
CK_FLAGS flags /* multi mode flag */
929+
(CK_SESSION_HANDLE hSession, /* the session's handle */
930+
CK_VOID_PTR pParameter, /* message specific parameter */
931+
CK_ULONG ulParameterLen, /* length of message specific parameter */
932+
CK_BYTE_PTR pCiphertextPart, /* cipher text */
933+
CK_ULONG ulCiphertextPartLen, /* cipher text length */
934+
CK_BYTE_PTR pPlaintextPart, /* gets plain text */
935+
CK_ULONG_PTR pulPlaintextPartLen, /* gets plain text length */
936+
CK_FLAGS flags /* multi mode flag */
921937
);
922938
#endif
923939

0 commit comments

Comments
 (0)