pkcs11 0.2.0-x86-mswin32 → 0.2.1-x86-mswin32

Sign up to get free protection for your applications and to get access to all the features.
Files changed (21) hide show
  1. data/.yardopts +1 -2
  2. data/History.txt +10 -0
  3. data/Manifest.txt +3 -0
  4. data/README.rdoc +31 -14
  5. data/Rakefile +6 -3
  6. data/ext/generate_constants.rb +57 -0
  7. data/ext/generate_structs.rb +173 -136
  8. data/ext/pk11.c +40 -367
  9. data/ext/pk11_const.c +205 -229
  10. data/ext/pk11_const_macros.h +37 -0
  11. data/ext/pk11_struct_def.inc +80 -82
  12. data/ext/pk11_struct_impl.inc +82 -84
  13. data/ext/pk11_struct_macros.h +423 -0
  14. data/lib/1.8/pkcs11_ext.so +0 -0
  15. data/lib/1.9/pkcs11_ext.so +0 -0
  16. data/lib/pkcs11/helper.rb +0 -9
  17. data/lib/pkcs11/slot.rb +1 -1
  18. data/test/test_pkcs11_crypt.rb +18 -1
  19. data/test/test_pkcs11_slot.rb +10 -1
  20. data/test/test_pkcs11_structs.rb +23 -4
  21. metadata +62 -25
data/ext/pk11_struct_def.inc CHANGED
@@ -1,99 +1,99 @@
1
1
  PKCS11_DEFINE_STRUCT(CK_VERSION);
2
- PKCS11_DEFINE_MEMBER(CK_VERSION, minor);
3
2
  PKCS11_DEFINE_MEMBER(CK_VERSION, major);
3
+ PKCS11_DEFINE_MEMBER(CK_VERSION, minor);
4
4
 
5
5
  PKCS11_DEFINE_STRUCT(CK_INFO);
6
- PKCS11_DEFINE_MEMBER(CK_INFO, flags);
7
- PKCS11_DEFINE_MEMBER(CK_INFO, manufacturerID);
8
6
  PKCS11_DEFINE_MEMBER(CK_INFO, cryptokiVersion);
7
+ PKCS11_DEFINE_MEMBER(CK_INFO, manufacturerID);
8
+ PKCS11_DEFINE_MEMBER(CK_INFO, flags);
9
9
  PKCS11_DEFINE_MEMBER(CK_INFO, libraryDescription);
10
10
  PKCS11_DEFINE_MEMBER(CK_INFO, libraryVersion);
11
11
 
12
12
  PKCS11_DEFINE_STRUCT(CK_SLOT_INFO);
13
- PKCS11_DEFINE_MEMBER(CK_SLOT_INFO, flags);
14
- PKCS11_DEFINE_MEMBER(CK_SLOT_INFO, manufacturerID);
15
13
  PKCS11_DEFINE_MEMBER(CK_SLOT_INFO, slotDescription);
16
- PKCS11_DEFINE_MEMBER(CK_SLOT_INFO, firmwareVersion);
14
+ PKCS11_DEFINE_MEMBER(CK_SLOT_INFO, manufacturerID);
15
+ PKCS11_DEFINE_MEMBER(CK_SLOT_INFO, flags);
17
16
  PKCS11_DEFINE_MEMBER(CK_SLOT_INFO, hardwareVersion);
17
+ PKCS11_DEFINE_MEMBER(CK_SLOT_INFO, firmwareVersion);
18
18
 
19
19
  PKCS11_DEFINE_STRUCT(CK_TOKEN_INFO);
20
- PKCS11_DEFINE_MEMBER(CK_TOKEN_INFO, ulSessionCount);
21
- PKCS11_DEFINE_MEMBER(CK_TOKEN_INFO, utcTime);
22
- PKCS11_DEFINE_MEMBER(CK_TOKEN_INFO, ulFreePublicMemory);
23
- PKCS11_DEFINE_MEMBER(CK_TOKEN_INFO, flags);
24
- PKCS11_DEFINE_MEMBER(CK_TOKEN_INFO, ulMinPinLen);
20
+ PKCS11_DEFINE_MEMBER(CK_TOKEN_INFO, label);
25
21
  PKCS11_DEFINE_MEMBER(CK_TOKEN_INFO, manufacturerID);
22
+ PKCS11_DEFINE_MEMBER(CK_TOKEN_INFO, model);
23
+ PKCS11_DEFINE_MEMBER(CK_TOKEN_INFO, serialNumber);
24
+ PKCS11_DEFINE_MEMBER(CK_TOKEN_INFO, flags);
26
25
  PKCS11_DEFINE_MEMBER(CK_TOKEN_INFO, ulMaxSessionCount);
27
- PKCS11_DEFINE_MEMBER(CK_TOKEN_INFO, ulFreePrivateMemory);
28
- PKCS11_DEFINE_MEMBER(CK_TOKEN_INFO, ulRwSessionCount);
26
+ PKCS11_DEFINE_MEMBER(CK_TOKEN_INFO, ulSessionCount);
29
27
  PKCS11_DEFINE_MEMBER(CK_TOKEN_INFO, ulMaxRwSessionCount);
28
+ PKCS11_DEFINE_MEMBER(CK_TOKEN_INFO, ulRwSessionCount);
29
+ PKCS11_DEFINE_MEMBER(CK_TOKEN_INFO, ulMaxPinLen);
30
+ PKCS11_DEFINE_MEMBER(CK_TOKEN_INFO, ulMinPinLen);
30
31
  PKCS11_DEFINE_MEMBER(CK_TOKEN_INFO, ulTotalPublicMemory);
32
+ PKCS11_DEFINE_MEMBER(CK_TOKEN_INFO, ulFreePublicMemory);
31
33
  PKCS11_DEFINE_MEMBER(CK_TOKEN_INFO, ulTotalPrivateMemory);
32
- PKCS11_DEFINE_MEMBER(CK_TOKEN_INFO, ulMaxPinLen);
33
- PKCS11_DEFINE_MEMBER(CK_TOKEN_INFO, model);
34
- PKCS11_DEFINE_MEMBER(CK_TOKEN_INFO, label);
35
- PKCS11_DEFINE_MEMBER(CK_TOKEN_INFO, firmwareVersion);
36
- PKCS11_DEFINE_MEMBER(CK_TOKEN_INFO, serialNumber);
34
+ PKCS11_DEFINE_MEMBER(CK_TOKEN_INFO, ulFreePrivateMemory);
37
35
  PKCS11_DEFINE_MEMBER(CK_TOKEN_INFO, hardwareVersion);
36
+ PKCS11_DEFINE_MEMBER(CK_TOKEN_INFO, firmwareVersion);
37
+ PKCS11_DEFINE_MEMBER(CK_TOKEN_INFO, utcTime);
38
38
 
39
39
  PKCS11_DEFINE_STRUCT(CK_SESSION_INFO);
40
- PKCS11_DEFINE_MEMBER(CK_SESSION_INFO, flags);
41
40
  PKCS11_DEFINE_MEMBER(CK_SESSION_INFO, slotID);
42
41
  PKCS11_DEFINE_MEMBER(CK_SESSION_INFO, state);
42
+ PKCS11_DEFINE_MEMBER(CK_SESSION_INFO, flags);
43
43
  PKCS11_DEFINE_MEMBER(CK_SESSION_INFO, ulDeviceError);
44
44
 
45
45
  PKCS11_DEFINE_STRUCT(CK_DATE);
46
+ PKCS11_DEFINE_MEMBER(CK_DATE, year);
46
47
  PKCS11_DEFINE_MEMBER(CK_DATE, month);
47
48
  PKCS11_DEFINE_MEMBER(CK_DATE, day);
48
- PKCS11_DEFINE_MEMBER(CK_DATE, year);
49
49
 
50
50
  PKCS11_DEFINE_STRUCT(CK_MECHANISM_INFO);
51
51
  PKCS11_DEFINE_MEMBER(CK_MECHANISM_INFO, ulMinKeySize);
52
- PKCS11_DEFINE_MEMBER(CK_MECHANISM_INFO, flags);
53
52
  PKCS11_DEFINE_MEMBER(CK_MECHANISM_INFO, ulMaxKeySize);
53
+ PKCS11_DEFINE_MEMBER(CK_MECHANISM_INFO, flags);
54
54
 
55
55
  PKCS11_DEFINE_STRUCT(CK_C_INITIALIZE_ARGS);
56
56
  PKCS11_DEFINE_MEMBER(CK_C_INITIALIZE_ARGS, pReserved);
57
- PKCS11_DEFINE_MEMBER(CK_C_INITIALIZE_ARGS, flags);
58
- /* unimplemented attr CK_UNLOCKMUTEX UnlockMutex */
59
- /* unimplemented attr CK_DESTROYMUTEX DestroyMutex */
60
57
  /* unimplemented attr CK_CREATEMUTEX CreateMutex */
58
+ /* unimplemented attr CK_DESTROYMUTEX DestroyMutex */
61
59
  /* unimplemented attr CK_LOCKMUTEX LockMutex */
60
+ /* unimplemented attr CK_UNLOCKMUTEX UnlockMutex */
61
+ PKCS11_DEFINE_MEMBER(CK_C_INITIALIZE_ARGS, flags);
62
62
 
63
63
  PKCS11_DEFINE_STRUCT(CK_RSA_PKCS_OAEP_PARAMS);
64
64
  PKCS11_DEFINE_MEMBER(CK_RSA_PKCS_OAEP_PARAMS, pSourceData);
65
- PKCS11_DEFINE_MEMBER(CK_RSA_PKCS_OAEP_PARAMS, source);
66
- PKCS11_DEFINE_MEMBER(CK_RSA_PKCS_OAEP_PARAMS, mgf);
67
65
  PKCS11_DEFINE_MEMBER(CK_RSA_PKCS_OAEP_PARAMS, hashAlg);
66
+ PKCS11_DEFINE_MEMBER(CK_RSA_PKCS_OAEP_PARAMS, mgf);
67
+ PKCS11_DEFINE_MEMBER(CK_RSA_PKCS_OAEP_PARAMS, source);
68
68
 
69
69
  PKCS11_DEFINE_STRUCT(CK_RSA_PKCS_PSS_PARAMS);
70
+ PKCS11_DEFINE_MEMBER(CK_RSA_PKCS_PSS_PARAMS, hashAlg);
70
71
  PKCS11_DEFINE_MEMBER(CK_RSA_PKCS_PSS_PARAMS, mgf);
71
72
  PKCS11_DEFINE_MEMBER(CK_RSA_PKCS_PSS_PARAMS, sLen);
72
- PKCS11_DEFINE_MEMBER(CK_RSA_PKCS_PSS_PARAMS, hashAlg);
73
73
 
74
74
  PKCS11_DEFINE_STRUCT(CK_ECDH1_DERIVE_PARAMS);
75
- PKCS11_DEFINE_MEMBER(CK_ECDH1_DERIVE_PARAMS, pPublicData);
76
75
  PKCS11_DEFINE_MEMBER(CK_ECDH1_DERIVE_PARAMS, pSharedData);
76
+ PKCS11_DEFINE_MEMBER(CK_ECDH1_DERIVE_PARAMS, pPublicData);
77
77
  PKCS11_DEFINE_MEMBER(CK_ECDH1_DERIVE_PARAMS, kdf);
78
78
 
79
79
  PKCS11_DEFINE_STRUCT(CK_ECDH2_DERIVE_PARAMS);
80
- PKCS11_DEFINE_MEMBER(CK_ECDH2_DERIVE_PARAMS, pPublicData2);
81
- PKCS11_DEFINE_MEMBER(CK_ECDH2_DERIVE_PARAMS, pPublicData);
82
80
  PKCS11_DEFINE_MEMBER(CK_ECDH2_DERIVE_PARAMS, pSharedData);
83
- PKCS11_DEFINE_MEMBER(CK_ECDH2_DERIVE_PARAMS, ulPublicDataLen2);
84
- PKCS11_DEFINE_MEMBER(CK_ECDH2_DERIVE_PARAMS, hPrivateData);
81
+ PKCS11_DEFINE_MEMBER(CK_ECDH2_DERIVE_PARAMS, pPublicData);
82
+ PKCS11_DEFINE_MEMBER(CK_ECDH2_DERIVE_PARAMS, pPublicData2);
85
83
  PKCS11_DEFINE_MEMBER(CK_ECDH2_DERIVE_PARAMS, kdf);
86
84
  PKCS11_DEFINE_MEMBER(CK_ECDH2_DERIVE_PARAMS, ulPrivateDataLen);
85
+ PKCS11_DEFINE_MEMBER(CK_ECDH2_DERIVE_PARAMS, hPrivateData);
86
+ PKCS11_DEFINE_MEMBER(CK_ECDH2_DERIVE_PARAMS, ulPublicDataLen2);
87
87
 
88
88
  PKCS11_DEFINE_STRUCT(CK_ECMQV_DERIVE_PARAMS);
89
- PKCS11_DEFINE_MEMBER(CK_ECMQV_DERIVE_PARAMS, pPublicData2);
90
- PKCS11_DEFINE_MEMBER(CK_ECMQV_DERIVE_PARAMS, pPublicData);
91
89
  PKCS11_DEFINE_MEMBER(CK_ECMQV_DERIVE_PARAMS, pSharedData);
92
- PKCS11_DEFINE_MEMBER(CK_ECMQV_DERIVE_PARAMS, publicKey);
93
- PKCS11_DEFINE_MEMBER(CK_ECMQV_DERIVE_PARAMS, ulPublicDataLen2);
94
- PKCS11_DEFINE_MEMBER(CK_ECMQV_DERIVE_PARAMS, hPrivateData);
90
+ PKCS11_DEFINE_MEMBER(CK_ECMQV_DERIVE_PARAMS, pPublicData);
91
+ PKCS11_DEFINE_MEMBER(CK_ECMQV_DERIVE_PARAMS, pPublicData2);
95
92
  PKCS11_DEFINE_MEMBER(CK_ECMQV_DERIVE_PARAMS, kdf);
96
93
  PKCS11_DEFINE_MEMBER(CK_ECMQV_DERIVE_PARAMS, ulPrivateDataLen);
94
+ PKCS11_DEFINE_MEMBER(CK_ECMQV_DERIVE_PARAMS, hPrivateData);
95
+ PKCS11_DEFINE_MEMBER(CK_ECMQV_DERIVE_PARAMS, ulPublicDataLen2);
96
+ PKCS11_DEFINE_MEMBER(CK_ECMQV_DERIVE_PARAMS, publicKey);
97
97
 
98
98
  PKCS11_DEFINE_STRUCT(CK_X9_42_DH1_DERIVE_PARAMS);
99
99
  PKCS11_DEFINE_MEMBER(CK_X9_42_DH1_DERIVE_PARAMS, pOtherInfo);
@@ -101,52 +101,52 @@ PKCS11_DEFINE_MEMBER(CK_X9_42_DH1_DERIVE_PARAMS, pPublicData);
101
101
  PKCS11_DEFINE_MEMBER(CK_X9_42_DH1_DERIVE_PARAMS, kdf);
102
102
 
103
103
  PKCS11_DEFINE_STRUCT(CK_X9_42_DH2_DERIVE_PARAMS);
104
- PKCS11_DEFINE_MEMBER(CK_X9_42_DH2_DERIVE_PARAMS, pPublicData2);
105
104
  PKCS11_DEFINE_MEMBER(CK_X9_42_DH2_DERIVE_PARAMS, pOtherInfo);
106
105
  PKCS11_DEFINE_MEMBER(CK_X9_42_DH2_DERIVE_PARAMS, pPublicData);
107
- PKCS11_DEFINE_MEMBER(CK_X9_42_DH2_DERIVE_PARAMS, ulPublicDataLen2);
108
- PKCS11_DEFINE_MEMBER(CK_X9_42_DH2_DERIVE_PARAMS, hPrivateData);
106
+ PKCS11_DEFINE_MEMBER(CK_X9_42_DH2_DERIVE_PARAMS, pPublicData2);
109
107
  PKCS11_DEFINE_MEMBER(CK_X9_42_DH2_DERIVE_PARAMS, kdf);
110
108
  PKCS11_DEFINE_MEMBER(CK_X9_42_DH2_DERIVE_PARAMS, ulPrivateDataLen);
109
+ PKCS11_DEFINE_MEMBER(CK_X9_42_DH2_DERIVE_PARAMS, hPrivateData);
110
+ PKCS11_DEFINE_MEMBER(CK_X9_42_DH2_DERIVE_PARAMS, ulPublicDataLen2);
111
111
 
112
112
  PKCS11_DEFINE_STRUCT(CK_X9_42_MQV_DERIVE_PARAMS);
113
- PKCS11_DEFINE_MEMBER(CK_X9_42_MQV_DERIVE_PARAMS, pPublicData2);
114
113
  PKCS11_DEFINE_MEMBER(CK_X9_42_MQV_DERIVE_PARAMS, pOtherInfo);
115
114
  PKCS11_DEFINE_MEMBER(CK_X9_42_MQV_DERIVE_PARAMS, pPublicData);
116
- PKCS11_DEFINE_MEMBER(CK_X9_42_MQV_DERIVE_PARAMS, publicKey);
117
- PKCS11_DEFINE_MEMBER(CK_X9_42_MQV_DERIVE_PARAMS, ulPublicDataLen2);
118
- PKCS11_DEFINE_MEMBER(CK_X9_42_MQV_DERIVE_PARAMS, hPrivateData);
115
+ PKCS11_DEFINE_MEMBER(CK_X9_42_MQV_DERIVE_PARAMS, pPublicData2);
119
116
  PKCS11_DEFINE_MEMBER(CK_X9_42_MQV_DERIVE_PARAMS, kdf);
120
117
  PKCS11_DEFINE_MEMBER(CK_X9_42_MQV_DERIVE_PARAMS, ulPrivateDataLen);
118
+ PKCS11_DEFINE_MEMBER(CK_X9_42_MQV_DERIVE_PARAMS, hPrivateData);
119
+ PKCS11_DEFINE_MEMBER(CK_X9_42_MQV_DERIVE_PARAMS, ulPublicDataLen2);
120
+ PKCS11_DEFINE_MEMBER(CK_X9_42_MQV_DERIVE_PARAMS, publicKey);
121
121
 
122
122
  PKCS11_DEFINE_STRUCT(CK_KEA_DERIVE_PARAMS);
123
123
  PKCS11_DEFINE_MEMBER(CK_KEA_DERIVE_PARAMS, pRandomA);
124
124
  PKCS11_DEFINE_MEMBER(CK_KEA_DERIVE_PARAMS, pRandomB);
125
125
  PKCS11_DEFINE_MEMBER(CK_KEA_DERIVE_PARAMS, pPublicData);
126
- PKCS11_DEFINE_MEMBER(CK_KEA_DERIVE_PARAMS, ulRandomLen);
127
126
  PKCS11_DEFINE_MEMBER(CK_KEA_DERIVE_PARAMS, isSender);
127
+ PKCS11_DEFINE_MEMBER(CK_KEA_DERIVE_PARAMS, ulRandomLen);
128
128
 
129
129
  PKCS11_DEFINE_STRUCT(CK_RC2_CBC_PARAMS);
130
130
  PKCS11_DEFINE_MEMBER(CK_RC2_CBC_PARAMS, ulEffectiveBits);
131
131
  PKCS11_DEFINE_MEMBER(CK_RC2_CBC_PARAMS, iv);
132
132
 
133
133
  PKCS11_DEFINE_STRUCT(CK_RC2_MAC_GENERAL_PARAMS);
134
- PKCS11_DEFINE_MEMBER(CK_RC2_MAC_GENERAL_PARAMS, ulMacLength);
135
134
  PKCS11_DEFINE_MEMBER(CK_RC2_MAC_GENERAL_PARAMS, ulEffectiveBits);
135
+ PKCS11_DEFINE_MEMBER(CK_RC2_MAC_GENERAL_PARAMS, ulMacLength);
136
136
 
137
137
  PKCS11_DEFINE_STRUCT(CK_RC5_PARAMS);
138
- PKCS11_DEFINE_MEMBER(CK_RC5_PARAMS, ulRounds);
139
138
  PKCS11_DEFINE_MEMBER(CK_RC5_PARAMS, ulWordsize);
139
+ PKCS11_DEFINE_MEMBER(CK_RC5_PARAMS, ulRounds);
140
140
 
141
141
  PKCS11_DEFINE_STRUCT(CK_RC5_CBC_PARAMS);
142
142
  PKCS11_DEFINE_MEMBER(CK_RC5_CBC_PARAMS, pIv);
143
- PKCS11_DEFINE_MEMBER(CK_RC5_CBC_PARAMS, ulRounds);
144
143
  PKCS11_DEFINE_MEMBER(CK_RC5_CBC_PARAMS, ulWordsize);
144
+ PKCS11_DEFINE_MEMBER(CK_RC5_CBC_PARAMS, ulRounds);
145
145
 
146
146
  PKCS11_DEFINE_STRUCT(CK_RC5_MAC_GENERAL_PARAMS);
147
- PKCS11_DEFINE_MEMBER(CK_RC5_MAC_GENERAL_PARAMS, ulMacLength);
148
- PKCS11_DEFINE_MEMBER(CK_RC5_MAC_GENERAL_PARAMS, ulRounds);
149
147
  PKCS11_DEFINE_MEMBER(CK_RC5_MAC_GENERAL_PARAMS, ulWordsize);
148
+ PKCS11_DEFINE_MEMBER(CK_RC5_MAC_GENERAL_PARAMS, ulRounds);
149
+ PKCS11_DEFINE_MEMBER(CK_RC5_MAC_GENERAL_PARAMS, ulMacLength);
150
150
 
151
151
  PKCS11_DEFINE_STRUCT(CK_DES_CBC_ENCRYPT_DATA_PARAMS);
152
152
  PKCS11_DEFINE_MEMBER(CK_DES_CBC_ENCRYPT_DATA_PARAMS, pData);
@@ -157,30 +157,30 @@ PKCS11_DEFINE_MEMBER(CK_AES_CBC_ENCRYPT_DATA_PARAMS, pData);
157
157
  PKCS11_DEFINE_MEMBER(CK_AES_CBC_ENCRYPT_DATA_PARAMS, iv);
158
158
 
159
159
  PKCS11_DEFINE_STRUCT(CK_SKIPJACK_PRIVATE_WRAP_PARAMS);
160
- PKCS11_DEFINE_MEMBER(CK_SKIPJACK_PRIVATE_WRAP_PARAMS, pRandomA);
161
- PKCS11_DEFINE_MEMBER(CK_SKIPJACK_PRIVATE_WRAP_PARAMS, pBaseG);
162
- PKCS11_DEFINE_MEMBER(CK_SKIPJACK_PRIVATE_WRAP_PARAMS, pPublicData);
163
160
  PKCS11_DEFINE_MEMBER(CK_SKIPJACK_PRIVATE_WRAP_PARAMS, pPassword);
161
+ PKCS11_DEFINE_MEMBER(CK_SKIPJACK_PRIVATE_WRAP_PARAMS, pPublicData);
162
+ PKCS11_DEFINE_MEMBER(CK_SKIPJACK_PRIVATE_WRAP_PARAMS, pRandomA);
164
163
  PKCS11_DEFINE_MEMBER(CK_SKIPJACK_PRIVATE_WRAP_PARAMS, pPrimeP);
164
+ PKCS11_DEFINE_MEMBER(CK_SKIPJACK_PRIVATE_WRAP_PARAMS, pBaseG);
165
165
  PKCS11_DEFINE_MEMBER(CK_SKIPJACK_PRIVATE_WRAP_PARAMS, pSubprimeQ);
166
- PKCS11_DEFINE_MEMBER(CK_SKIPJACK_PRIVATE_WRAP_PARAMS, ulQLen);
167
166
  PKCS11_DEFINE_MEMBER(CK_SKIPJACK_PRIVATE_WRAP_PARAMS, ulPAndGLen);
167
+ PKCS11_DEFINE_MEMBER(CK_SKIPJACK_PRIVATE_WRAP_PARAMS, ulQLen);
168
168
  PKCS11_DEFINE_MEMBER(CK_SKIPJACK_PRIVATE_WRAP_PARAMS, ulRandomLen);
169
169
 
170
170
  PKCS11_DEFINE_STRUCT(CK_SKIPJACK_RELAYX_PARAMS);
171
+ PKCS11_DEFINE_MEMBER(CK_SKIPJACK_RELAYX_PARAMS, pOldWrappedX);
172
+ PKCS11_DEFINE_MEMBER(CK_SKIPJACK_RELAYX_PARAMS, pOldPassword);
173
+ PKCS11_DEFINE_MEMBER(CK_SKIPJACK_RELAYX_PARAMS, pOldPublicData);
174
+ PKCS11_DEFINE_MEMBER(CK_SKIPJACK_RELAYX_PARAMS, pOldRandomA);
171
175
  PKCS11_DEFINE_MEMBER(CK_SKIPJACK_RELAYX_PARAMS, pNewPassword);
172
176
  PKCS11_DEFINE_MEMBER(CK_SKIPJACK_RELAYX_PARAMS, pNewPublicData);
173
- PKCS11_DEFINE_MEMBER(CK_SKIPJACK_RELAYX_PARAMS, pOldRandomA);
174
177
  PKCS11_DEFINE_MEMBER(CK_SKIPJACK_RELAYX_PARAMS, pNewRandomA);
175
- PKCS11_DEFINE_MEMBER(CK_SKIPJACK_RELAYX_PARAMS, pOldPublicData);
176
- PKCS11_DEFINE_MEMBER(CK_SKIPJACK_RELAYX_PARAMS, pOldPassword);
177
- PKCS11_DEFINE_MEMBER(CK_SKIPJACK_RELAYX_PARAMS, pOldWrappedX);
178
178
  PKCS11_DEFINE_MEMBER(CK_SKIPJACK_RELAYX_PARAMS, ulOldRandomLen);
179
179
  PKCS11_DEFINE_MEMBER(CK_SKIPJACK_RELAYX_PARAMS, ulNewRandomLen);
180
180
 
181
181
  PKCS11_DEFINE_STRUCT(CK_PBE_PARAMS);
182
- PKCS11_DEFINE_MEMBER(CK_PBE_PARAMS, pPassword);
183
182
  PKCS11_DEFINE_MEMBER(CK_PBE_PARAMS, pInitVector);
183
+ PKCS11_DEFINE_MEMBER(CK_PBE_PARAMS, pPassword);
184
184
  PKCS11_DEFINE_MEMBER(CK_PBE_PARAMS, pSalt);
185
185
  PKCS11_DEFINE_MEMBER(CK_PBE_PARAMS, ulIteration);
186
186
 
@@ -199,23 +199,23 @@ PKCS11_DEFINE_MEMBER(CK_SSL3_MASTER_KEY_DERIVE_PARAMS, pVersion);
199
199
  PKCS11_DEFINE_STRUCT(CK_SSL3_KEY_MAT_OUT);
200
200
  PKCS11_DEFINE_MEMBER(CK_SSL3_KEY_MAT_OUT, pIVClient);
201
201
  PKCS11_DEFINE_MEMBER(CK_SSL3_KEY_MAT_OUT, pIVServer);
202
- PKCS11_DEFINE_MEMBER(CK_SSL3_KEY_MAT_OUT, hServerKey);
202
+ PKCS11_DEFINE_MEMBER(CK_SSL3_KEY_MAT_OUT, hClientMacSecret);
203
203
  PKCS11_DEFINE_MEMBER(CK_SSL3_KEY_MAT_OUT, hServerMacSecret);
204
204
  PKCS11_DEFINE_MEMBER(CK_SSL3_KEY_MAT_OUT, hClientKey);
205
- PKCS11_DEFINE_MEMBER(CK_SSL3_KEY_MAT_OUT, hClientMacSecret);
205
+ PKCS11_DEFINE_MEMBER(CK_SSL3_KEY_MAT_OUT, hServerKey);
206
206
 
207
207
  PKCS11_DEFINE_STRUCT(CK_SSL3_KEY_MAT_PARAMS);
208
- PKCS11_DEFINE_MEMBER(CK_SSL3_KEY_MAT_PARAMS, RandomInfo);
209
- PKCS11_DEFINE_MEMBER(CK_SSL3_KEY_MAT_PARAMS, ulIVSizeInBits);
210
- PKCS11_DEFINE_MEMBER(CK_SSL3_KEY_MAT_PARAMS, ulKeySizeInBits);
211
208
  PKCS11_DEFINE_MEMBER(CK_SSL3_KEY_MAT_PARAMS, ulMacSizeInBits);
212
- PKCS11_DEFINE_MEMBER(CK_SSL3_KEY_MAT_PARAMS, pReturnedKeyMaterial);
209
+ PKCS11_DEFINE_MEMBER(CK_SSL3_KEY_MAT_PARAMS, ulKeySizeInBits);
210
+ PKCS11_DEFINE_MEMBER(CK_SSL3_KEY_MAT_PARAMS, ulIVSizeInBits);
213
211
  PKCS11_DEFINE_MEMBER(CK_SSL3_KEY_MAT_PARAMS, bIsExport);
212
+ PKCS11_DEFINE_MEMBER(CK_SSL3_KEY_MAT_PARAMS, RandomInfo);
213
+ PKCS11_DEFINE_MEMBER(CK_SSL3_KEY_MAT_PARAMS, pReturnedKeyMaterial);
214
214
 
215
215
  PKCS11_DEFINE_STRUCT(CK_TLS_PRF_PARAMS);
216
+ PKCS11_DEFINE_MEMBER(CK_TLS_PRF_PARAMS, pSeed);
216
217
  PKCS11_DEFINE_MEMBER(CK_TLS_PRF_PARAMS, pLabel);
217
218
  PKCS11_DEFINE_MEMBER(CK_TLS_PRF_PARAMS, pOutput);
218
- PKCS11_DEFINE_MEMBER(CK_TLS_PRF_PARAMS, pSeed);
219
219
  PKCS11_DEFINE_MEMBER(CK_TLS_PRF_PARAMS, pulOutputLen);
220
220
 
221
221
  PKCS11_DEFINE_STRUCT(CK_WTLS_RANDOM_DATA);
@@ -228,9 +228,9 @@ PKCS11_DEFINE_MEMBER(CK_WTLS_MASTER_KEY_DERIVE_PARAMS, DigestMechanism);
228
228
  PKCS11_DEFINE_MEMBER(CK_WTLS_MASTER_KEY_DERIVE_PARAMS, RandomInfo);
229
229
 
230
230
  PKCS11_DEFINE_STRUCT(CK_WTLS_PRF_PARAMS);
231
+ PKCS11_DEFINE_MEMBER(CK_WTLS_PRF_PARAMS, pSeed);
231
232
  PKCS11_DEFINE_MEMBER(CK_WTLS_PRF_PARAMS, pLabel);
232
233
  PKCS11_DEFINE_MEMBER(CK_WTLS_PRF_PARAMS, pOutput);
233
- PKCS11_DEFINE_MEMBER(CK_WTLS_PRF_PARAMS, pSeed);
234
234
  PKCS11_DEFINE_MEMBER(CK_WTLS_PRF_PARAMS, DigestMechanism);
235
235
  PKCS11_DEFINE_MEMBER(CK_WTLS_PRF_PARAMS, pulOutputLen);
236
236
 
@@ -240,45 +240,43 @@ PKCS11_DEFINE_MEMBER(CK_WTLS_KEY_MAT_OUT, hMacSecret);
240
240
  PKCS11_DEFINE_MEMBER(CK_WTLS_KEY_MAT_OUT, hKey);
241
241
 
242
242
  PKCS11_DEFINE_STRUCT(CK_WTLS_KEY_MAT_PARAMS);
243
- PKCS11_DEFINE_MEMBER(CK_WTLS_KEY_MAT_PARAMS, ulSequenceNumber);
244
243
  PKCS11_DEFINE_MEMBER(CK_WTLS_KEY_MAT_PARAMS, DigestMechanism);
245
- PKCS11_DEFINE_MEMBER(CK_WTLS_KEY_MAT_PARAMS, RandomInfo);
246
- PKCS11_DEFINE_MEMBER(CK_WTLS_KEY_MAT_PARAMS, ulIVSizeInBits);
247
- PKCS11_DEFINE_MEMBER(CK_WTLS_KEY_MAT_PARAMS, pReturnedKeyMaterial);
248
- PKCS11_DEFINE_MEMBER(CK_WTLS_KEY_MAT_PARAMS, ulKeySizeInBits);
249
244
  PKCS11_DEFINE_MEMBER(CK_WTLS_KEY_MAT_PARAMS, ulMacSizeInBits);
245
+ PKCS11_DEFINE_MEMBER(CK_WTLS_KEY_MAT_PARAMS, ulKeySizeInBits);
246
+ PKCS11_DEFINE_MEMBER(CK_WTLS_KEY_MAT_PARAMS, ulIVSizeInBits);
247
+ PKCS11_DEFINE_MEMBER(CK_WTLS_KEY_MAT_PARAMS, ulSequenceNumber);
250
248
  PKCS11_DEFINE_MEMBER(CK_WTLS_KEY_MAT_PARAMS, bIsExport);
249
+ PKCS11_DEFINE_MEMBER(CK_WTLS_KEY_MAT_PARAMS, RandomInfo);
250
+ PKCS11_DEFINE_MEMBER(CK_WTLS_KEY_MAT_PARAMS, pReturnedKeyMaterial);
251
251
 
252
252
  PKCS11_DEFINE_STRUCT(CK_CMS_SIG_PARAMS);
253
- PKCS11_DEFINE_MEMBER(CK_CMS_SIG_PARAMS, pRequestedAttributes);
254
253
  PKCS11_DEFINE_MEMBER(CK_CMS_SIG_PARAMS, pContentType);
254
+ PKCS11_DEFINE_MEMBER(CK_CMS_SIG_PARAMS, pRequestedAttributes);
255
255
  PKCS11_DEFINE_MEMBER(CK_CMS_SIG_PARAMS, pRequiredAttributes);
256
- PKCS11_DEFINE_MEMBER(CK_CMS_SIG_PARAMS, pDigestMechanism);
257
- PKCS11_DEFINE_MEMBER(CK_CMS_SIG_PARAMS, pSigningMechanism);
258
256
  PKCS11_DEFINE_MEMBER(CK_CMS_SIG_PARAMS, certificateHandle);
257
+ PKCS11_DEFINE_MEMBER(CK_CMS_SIG_PARAMS, pSigningMechanism);
258
+ PKCS11_DEFINE_MEMBER(CK_CMS_SIG_PARAMS, pDigestMechanism);
259
259
 
260
260
  PKCS11_DEFINE_STRUCT(CK_KEY_DERIVATION_STRING_DATA);
261
261
  PKCS11_DEFINE_MEMBER(CK_KEY_DERIVATION_STRING_DATA, pData);
262
262
 
263
263
  PKCS11_DEFINE_STRUCT(CK_PKCS5_PBKD2_PARAMS);
264
264
  PKCS11_DEFINE_MEMBER(CK_PKCS5_PBKD2_PARAMS, pSaltSourceData);
265
- PKCS11_DEFINE_MEMBER(CK_PKCS5_PBKD2_PARAMS, pPassword);
266
265
  PKCS11_DEFINE_MEMBER(CK_PKCS5_PBKD2_PARAMS, pPrfData);
266
+ PKCS11_DEFINE_MEMBER(CK_PKCS5_PBKD2_PARAMS, pPassword);
267
267
  PKCS11_DEFINE_MEMBER(CK_PKCS5_PBKD2_PARAMS, saltSource);
268
- PKCS11_DEFINE_MEMBER(CK_PKCS5_PBKD2_PARAMS, ulPasswordLen);
269
- PKCS11_DEFINE_MEMBER(CK_PKCS5_PBKD2_PARAMS, prf);
270
268
  PKCS11_DEFINE_MEMBER(CK_PKCS5_PBKD2_PARAMS, iterations);
269
+ PKCS11_DEFINE_MEMBER(CK_PKCS5_PBKD2_PARAMS, prf);
270
+ PKCS11_DEFINE_MEMBER(CK_PKCS5_PBKD2_PARAMS, ulPasswordLen);
271
271
 
272
272
  PKCS11_DEFINE_STRUCT(CK_OTP_PARAM);
273
273
  PKCS11_DEFINE_MEMBER(CK_OTP_PARAM, pValue);
274
274
  PKCS11_DEFINE_MEMBER(CK_OTP_PARAM, type);
275
275
 
276
276
  PKCS11_DEFINE_STRUCT(CK_OTP_PARAMS);
277
- PKCS11_DEFINE_MEMBER(CK_OTP_PARAMS, ulCount);
278
277
  PKCS11_DEFINE_MEMBER(CK_OTP_PARAMS, pParams);
279
278
 
280
279
  PKCS11_DEFINE_STRUCT(CK_OTP_SIGNATURE_INFO);
281
- PKCS11_DEFINE_MEMBER(CK_OTP_SIGNATURE_INFO, ulCount);
282
280
  PKCS11_DEFINE_MEMBER(CK_OTP_SIGNATURE_INFO, pParams);
283
281
 
284
282
  PKCS11_DEFINE_STRUCT(CK_KIP_PARAMS);
@@ -287,12 +285,12 @@ PKCS11_DEFINE_MEMBER(CK_KIP_PARAMS, pMechanism);
287
285
  PKCS11_DEFINE_MEMBER(CK_KIP_PARAMS, hKey);
288
286
 
289
287
  PKCS11_DEFINE_STRUCT(CK_AES_CTR_PARAMS);
290
- PKCS11_DEFINE_MEMBER(CK_AES_CTR_PARAMS, cb);
291
288
  PKCS11_DEFINE_MEMBER(CK_AES_CTR_PARAMS, ulCounterBits);
289
+ PKCS11_DEFINE_MEMBER(CK_AES_CTR_PARAMS, cb);
292
290
 
293
291
  PKCS11_DEFINE_STRUCT(CK_CAMELLIA_CTR_PARAMS);
294
- PKCS11_DEFINE_MEMBER(CK_CAMELLIA_CTR_PARAMS, cb);
295
292
  PKCS11_DEFINE_MEMBER(CK_CAMELLIA_CTR_PARAMS, ulCounterBits);
293
+ PKCS11_DEFINE_MEMBER(CK_CAMELLIA_CTR_PARAMS, cb);
296
294
 
297
295
  PKCS11_DEFINE_STRUCT(CK_CAMELLIA_CBC_ENCRYPT_DATA_PARAMS);
298
296
  PKCS11_DEFINE_MEMBER(CK_CAMELLIA_CBC_ENCRYPT_DATA_PARAMS, pData);
data/ext/pk11_struct_impl.inc CHANGED
@@ -1,99 +1,99 @@
1
1
  PKCS11_IMPLEMENT_STRUCT_WITH_ALLOCATOR(CK_VERSION);
2
- PKCS11_IMPLEMENT_BYTE_ACCESSOR(CK_VERSION, minor);
3
2
  PKCS11_IMPLEMENT_BYTE_ACCESSOR(CK_VERSION, major);
3
+ PKCS11_IMPLEMENT_BYTE_ACCESSOR(CK_VERSION, minor);
4
4
 
5
5
  PKCS11_IMPLEMENT_ALLOCATOR(CK_INFO);
6
- PKCS11_IMPLEMENT_ULONG_ACCESSOR(CK_INFO, flags);
7
- PKCS11_IMPLEMENT_STRING_ACCESSOR(CK_INFO, manufacturerID);
8
6
  PKCS11_IMPLEMENT_STRUCT_ACCESSOR(CK_INFO, CK_VERSION, cryptokiVersion);
7
+ PKCS11_IMPLEMENT_STRING_ACCESSOR(CK_INFO, manufacturerID);
8
+ PKCS11_IMPLEMENT_ULONG_ACCESSOR(CK_INFO, flags);
9
9
  PKCS11_IMPLEMENT_STRING_ACCESSOR(CK_INFO, libraryDescription);
10
10
  PKCS11_IMPLEMENT_STRUCT_ACCESSOR(CK_INFO, CK_VERSION, libraryVersion);
11
11
 
12
12
  PKCS11_IMPLEMENT_ALLOCATOR(CK_SLOT_INFO);
13
- PKCS11_IMPLEMENT_ULONG_ACCESSOR(CK_SLOT_INFO, flags);
14
- PKCS11_IMPLEMENT_STRING_ACCESSOR(CK_SLOT_INFO, manufacturerID);
15
13
  PKCS11_IMPLEMENT_STRING_ACCESSOR(CK_SLOT_INFO, slotDescription);
16
- PKCS11_IMPLEMENT_STRUCT_ACCESSOR(CK_SLOT_INFO, CK_VERSION, firmwareVersion);
14
+ PKCS11_IMPLEMENT_STRING_ACCESSOR(CK_SLOT_INFO, manufacturerID);
15
+ PKCS11_IMPLEMENT_ULONG_ACCESSOR(CK_SLOT_INFO, flags);
17
16
  PKCS11_IMPLEMENT_STRUCT_ACCESSOR(CK_SLOT_INFO, CK_VERSION, hardwareVersion);
17
+ PKCS11_IMPLEMENT_STRUCT_ACCESSOR(CK_SLOT_INFO, CK_VERSION, firmwareVersion);
18
18
 
19
19
  PKCS11_IMPLEMENT_ALLOCATOR(CK_TOKEN_INFO);
20
- PKCS11_IMPLEMENT_ULONG_ACCESSOR(CK_TOKEN_INFO, ulSessionCount);
21
- PKCS11_IMPLEMENT_STRING_ACCESSOR(CK_TOKEN_INFO, utcTime);
22
- PKCS11_IMPLEMENT_ULONG_ACCESSOR(CK_TOKEN_INFO, ulFreePublicMemory);
23
- PKCS11_IMPLEMENT_ULONG_ACCESSOR(CK_TOKEN_INFO, flags);
24
- PKCS11_IMPLEMENT_ULONG_ACCESSOR(CK_TOKEN_INFO, ulMinPinLen);
20
+ PKCS11_IMPLEMENT_STRING_ACCESSOR(CK_TOKEN_INFO, label);
25
21
  PKCS11_IMPLEMENT_STRING_ACCESSOR(CK_TOKEN_INFO, manufacturerID);
22
+ PKCS11_IMPLEMENT_STRING_ACCESSOR(CK_TOKEN_INFO, model);
23
+ PKCS11_IMPLEMENT_STRING_ACCESSOR(CK_TOKEN_INFO, serialNumber);
24
+ PKCS11_IMPLEMENT_ULONG_ACCESSOR(CK_TOKEN_INFO, flags);
26
25
  PKCS11_IMPLEMENT_ULONG_ACCESSOR(CK_TOKEN_INFO, ulMaxSessionCount);
27
- PKCS11_IMPLEMENT_ULONG_ACCESSOR(CK_TOKEN_INFO, ulFreePrivateMemory);
28
- PKCS11_IMPLEMENT_ULONG_ACCESSOR(CK_TOKEN_INFO, ulRwSessionCount);
26
+ PKCS11_IMPLEMENT_ULONG_ACCESSOR(CK_TOKEN_INFO, ulSessionCount);
29
27
  PKCS11_IMPLEMENT_ULONG_ACCESSOR(CK_TOKEN_INFO, ulMaxRwSessionCount);
28
+ PKCS11_IMPLEMENT_ULONG_ACCESSOR(CK_TOKEN_INFO, ulRwSessionCount);
29
+ PKCS11_IMPLEMENT_ULONG_ACCESSOR(CK_TOKEN_INFO, ulMaxPinLen);
30
+ PKCS11_IMPLEMENT_ULONG_ACCESSOR(CK_TOKEN_INFO, ulMinPinLen);
30
31
  PKCS11_IMPLEMENT_ULONG_ACCESSOR(CK_TOKEN_INFO, ulTotalPublicMemory);
32
+ PKCS11_IMPLEMENT_ULONG_ACCESSOR(CK_TOKEN_INFO, ulFreePublicMemory);
31
33
  PKCS11_IMPLEMENT_ULONG_ACCESSOR(CK_TOKEN_INFO, ulTotalPrivateMemory);
32
- PKCS11_IMPLEMENT_ULONG_ACCESSOR(CK_TOKEN_INFO, ulMaxPinLen);
33
- PKCS11_IMPLEMENT_STRING_ACCESSOR(CK_TOKEN_INFO, model);
34
- PKCS11_IMPLEMENT_STRING_ACCESSOR(CK_TOKEN_INFO, label);
35
- PKCS11_IMPLEMENT_STRUCT_ACCESSOR(CK_TOKEN_INFO, CK_VERSION, firmwareVersion);
36
- PKCS11_IMPLEMENT_STRING_ACCESSOR(CK_TOKEN_INFO, serialNumber);
34
+ PKCS11_IMPLEMENT_ULONG_ACCESSOR(CK_TOKEN_INFO, ulFreePrivateMemory);
37
35
  PKCS11_IMPLEMENT_STRUCT_ACCESSOR(CK_TOKEN_INFO, CK_VERSION, hardwareVersion);
36
+ PKCS11_IMPLEMENT_STRUCT_ACCESSOR(CK_TOKEN_INFO, CK_VERSION, firmwareVersion);
37
+ PKCS11_IMPLEMENT_STRING_ACCESSOR(CK_TOKEN_INFO, utcTime);
38
38
 
39
39
  PKCS11_IMPLEMENT_ALLOCATOR(CK_SESSION_INFO);
40
- PKCS11_IMPLEMENT_ULONG_ACCESSOR(CK_SESSION_INFO, flags);
41
40
  PKCS11_IMPLEMENT_ULONG_ACCESSOR(CK_SESSION_INFO, slotID);
42
41
  PKCS11_IMPLEMENT_ULONG_ACCESSOR(CK_SESSION_INFO, state);
42
+ PKCS11_IMPLEMENT_ULONG_ACCESSOR(CK_SESSION_INFO, flags);
43
43
  PKCS11_IMPLEMENT_ULONG_ACCESSOR(CK_SESSION_INFO, ulDeviceError);
44
44
 
45
45
  PKCS11_IMPLEMENT_STRUCT_WITH_ALLOCATOR(CK_DATE);
46
+ PKCS11_IMPLEMENT_STRING_ACCESSOR(CK_DATE, year);
46
47
  PKCS11_IMPLEMENT_STRING_ACCESSOR(CK_DATE, month);
47
48
  PKCS11_IMPLEMENT_STRING_ACCESSOR(CK_DATE, day);
48
- PKCS11_IMPLEMENT_STRING_ACCESSOR(CK_DATE, year);
49
49
 
50
50
  PKCS11_IMPLEMENT_ALLOCATOR(CK_MECHANISM_INFO);
51
51
  PKCS11_IMPLEMENT_ULONG_ACCESSOR(CK_MECHANISM_INFO, ulMinKeySize);
52
- PKCS11_IMPLEMENT_ULONG_ACCESSOR(CK_MECHANISM_INFO, flags);
53
52
  PKCS11_IMPLEMENT_ULONG_ACCESSOR(CK_MECHANISM_INFO, ulMaxKeySize);
53
+ PKCS11_IMPLEMENT_ULONG_ACCESSOR(CK_MECHANISM_INFO, flags);
54
54
 
55
55
  PKCS11_IMPLEMENT_ALLOCATOR(CK_C_INITIALIZE_ARGS);
56
56
  PKCS11_IMPLEMENT_STRING_PTR_ACCESSOR(CK_C_INITIALIZE_ARGS, pReserved);
57
- PKCS11_IMPLEMENT_ULONG_ACCESSOR(CK_C_INITIALIZE_ARGS, flags);
58
- /* unimplemented attr CK_UNLOCKMUTEX UnlockMutex */
59
- /* unimplemented attr CK_DESTROYMUTEX DestroyMutex */
60
57
  /* unimplemented attr CK_CREATEMUTEX CreateMutex */
58
+ /* unimplemented attr CK_DESTROYMUTEX DestroyMutex */
61
59
  /* unimplemented attr CK_LOCKMUTEX LockMutex */
60
+ /* unimplemented attr CK_UNLOCKMUTEX UnlockMutex */
61
+ PKCS11_IMPLEMENT_ULONG_ACCESSOR(CK_C_INITIALIZE_ARGS, flags);
62
62
 
63
63
  PKCS11_IMPLEMENT_STRUCT_WITH_ALLOCATOR(CK_RSA_PKCS_OAEP_PARAMS);
64
64
  PKCS11_IMPLEMENT_STRING_PTR_LEN_ACCESSOR(CK_RSA_PKCS_OAEP_PARAMS, pSourceData, ulSourceDataLen);
65
- PKCS11_IMPLEMENT_ULONG_ACCESSOR(CK_RSA_PKCS_OAEP_PARAMS, source);
66
- PKCS11_IMPLEMENT_ULONG_ACCESSOR(CK_RSA_PKCS_OAEP_PARAMS, mgf);
67
65
  PKCS11_IMPLEMENT_ULONG_ACCESSOR(CK_RSA_PKCS_OAEP_PARAMS, hashAlg);
66
+ PKCS11_IMPLEMENT_ULONG_ACCESSOR(CK_RSA_PKCS_OAEP_PARAMS, mgf);
67
+ PKCS11_IMPLEMENT_ULONG_ACCESSOR(CK_RSA_PKCS_OAEP_PARAMS, source);
68
68
 
69
69
  PKCS11_IMPLEMENT_STRUCT_WITH_ALLOCATOR(CK_RSA_PKCS_PSS_PARAMS);
70
+ PKCS11_IMPLEMENT_ULONG_ACCESSOR(CK_RSA_PKCS_PSS_PARAMS, hashAlg);
70
71
  PKCS11_IMPLEMENT_ULONG_ACCESSOR(CK_RSA_PKCS_PSS_PARAMS, mgf);
71
72
  PKCS11_IMPLEMENT_ULONG_ACCESSOR(CK_RSA_PKCS_PSS_PARAMS, sLen);
72
- PKCS11_IMPLEMENT_ULONG_ACCESSOR(CK_RSA_PKCS_PSS_PARAMS, hashAlg);
73
73
 
74
74
  PKCS11_IMPLEMENT_STRUCT_WITH_ALLOCATOR(CK_ECDH1_DERIVE_PARAMS);
75
- PKCS11_IMPLEMENT_STRING_PTR_LEN_ACCESSOR(CK_ECDH1_DERIVE_PARAMS, pPublicData, ulPublicDataLen);
76
75
  PKCS11_IMPLEMENT_STRING_PTR_LEN_ACCESSOR(CK_ECDH1_DERIVE_PARAMS, pSharedData, ulSharedDataLen);
76
+ PKCS11_IMPLEMENT_STRING_PTR_LEN_ACCESSOR(CK_ECDH1_DERIVE_PARAMS, pPublicData, ulPublicDataLen);
77
77
  PKCS11_IMPLEMENT_ULONG_ACCESSOR(CK_ECDH1_DERIVE_PARAMS, kdf);
78
78
 
79
79
  PKCS11_IMPLEMENT_STRUCT_WITH_ALLOCATOR(CK_ECDH2_DERIVE_PARAMS);
80
- PKCS11_IMPLEMENT_STRING_PTR_ACCESSOR(CK_ECDH2_DERIVE_PARAMS, pPublicData2);
81
- PKCS11_IMPLEMENT_STRING_PTR_LEN_ACCESSOR(CK_ECDH2_DERIVE_PARAMS, pPublicData, ulPublicDataLen);
82
80
  PKCS11_IMPLEMENT_STRING_PTR_LEN_ACCESSOR(CK_ECDH2_DERIVE_PARAMS, pSharedData, ulSharedDataLen);
83
- PKCS11_IMPLEMENT_ULONG_ACCESSOR(CK_ECDH2_DERIVE_PARAMS, ulPublicDataLen2);
84
- PKCS11_IMPLEMENT_HANDLE_ACCESSOR(CK_ECDH2_DERIVE_PARAMS, hPrivateData);
81
+ PKCS11_IMPLEMENT_STRING_PTR_LEN_ACCESSOR(CK_ECDH2_DERIVE_PARAMS, pPublicData, ulPublicDataLen);
82
+ PKCS11_IMPLEMENT_STRING_PTR_ACCESSOR(CK_ECDH2_DERIVE_PARAMS, pPublicData2);
85
83
  PKCS11_IMPLEMENT_ULONG_ACCESSOR(CK_ECDH2_DERIVE_PARAMS, kdf);
86
84
  PKCS11_IMPLEMENT_ULONG_ACCESSOR(CK_ECDH2_DERIVE_PARAMS, ulPrivateDataLen);
85
+ PKCS11_IMPLEMENT_HANDLE_ACCESSOR(CK_ECDH2_DERIVE_PARAMS, hPrivateData);
86
+ PKCS11_IMPLEMENT_ULONG_ACCESSOR(CK_ECDH2_DERIVE_PARAMS, ulPublicDataLen2);
87
87
 
88
88
  PKCS11_IMPLEMENT_STRUCT_WITH_ALLOCATOR(CK_ECMQV_DERIVE_PARAMS);
89
- PKCS11_IMPLEMENT_STRING_PTR_ACCESSOR(CK_ECMQV_DERIVE_PARAMS, pPublicData2);
90
- PKCS11_IMPLEMENT_STRING_PTR_LEN_ACCESSOR(CK_ECMQV_DERIVE_PARAMS, pPublicData, ulPublicDataLen);
91
89
  PKCS11_IMPLEMENT_STRING_PTR_LEN_ACCESSOR(CK_ECMQV_DERIVE_PARAMS, pSharedData, ulSharedDataLen);
92
- PKCS11_IMPLEMENT_HANDLE_ACCESSOR(CK_ECMQV_DERIVE_PARAMS, publicKey);
93
- PKCS11_IMPLEMENT_ULONG_ACCESSOR(CK_ECMQV_DERIVE_PARAMS, ulPublicDataLen2);
94
- PKCS11_IMPLEMENT_HANDLE_ACCESSOR(CK_ECMQV_DERIVE_PARAMS, hPrivateData);
90
+ PKCS11_IMPLEMENT_STRING_PTR_LEN_ACCESSOR(CK_ECMQV_DERIVE_PARAMS, pPublicData, ulPublicDataLen);
91
+ PKCS11_IMPLEMENT_STRING_PTR_ACCESSOR(CK_ECMQV_DERIVE_PARAMS, pPublicData2);
95
92
  PKCS11_IMPLEMENT_ULONG_ACCESSOR(CK_ECMQV_DERIVE_PARAMS, kdf);
96
93
  PKCS11_IMPLEMENT_ULONG_ACCESSOR(CK_ECMQV_DERIVE_PARAMS, ulPrivateDataLen);
94
+ PKCS11_IMPLEMENT_HANDLE_ACCESSOR(CK_ECMQV_DERIVE_PARAMS, hPrivateData);
95
+ PKCS11_IMPLEMENT_ULONG_ACCESSOR(CK_ECMQV_DERIVE_PARAMS, ulPublicDataLen2);
96
+ PKCS11_IMPLEMENT_HANDLE_ACCESSOR(CK_ECMQV_DERIVE_PARAMS, publicKey);
97
97
 
98
98
  PKCS11_IMPLEMENT_STRUCT_WITH_ALLOCATOR(CK_X9_42_DH1_DERIVE_PARAMS);
99
99
  PKCS11_IMPLEMENT_STRING_PTR_LEN_ACCESSOR(CK_X9_42_DH1_DERIVE_PARAMS, pOtherInfo, ulOtherInfoLen);
@@ -101,52 +101,52 @@ PKCS11_IMPLEMENT_STRING_PTR_LEN_ACCESSOR(CK_X9_42_DH1_DERIVE_PARAMS, pPublicData
101
101
  PKCS11_IMPLEMENT_ULONG_ACCESSOR(CK_X9_42_DH1_DERIVE_PARAMS, kdf);
102
102
 
103
103
  PKCS11_IMPLEMENT_STRUCT_WITH_ALLOCATOR(CK_X9_42_DH2_DERIVE_PARAMS);
104
- PKCS11_IMPLEMENT_STRING_PTR_ACCESSOR(CK_X9_42_DH2_DERIVE_PARAMS, pPublicData2);
105
104
  PKCS11_IMPLEMENT_STRING_PTR_LEN_ACCESSOR(CK_X9_42_DH2_DERIVE_PARAMS, pOtherInfo, ulOtherInfoLen);
106
105
  PKCS11_IMPLEMENT_STRING_PTR_LEN_ACCESSOR(CK_X9_42_DH2_DERIVE_PARAMS, pPublicData, ulPublicDataLen);
107
- PKCS11_IMPLEMENT_ULONG_ACCESSOR(CK_X9_42_DH2_DERIVE_PARAMS, ulPublicDataLen2);
108
- PKCS11_IMPLEMENT_HANDLE_ACCESSOR(CK_X9_42_DH2_DERIVE_PARAMS, hPrivateData);
106
+ PKCS11_IMPLEMENT_STRING_PTR_ACCESSOR(CK_X9_42_DH2_DERIVE_PARAMS, pPublicData2);
109
107
  PKCS11_IMPLEMENT_ULONG_ACCESSOR(CK_X9_42_DH2_DERIVE_PARAMS, kdf);
110
108
  PKCS11_IMPLEMENT_ULONG_ACCESSOR(CK_X9_42_DH2_DERIVE_PARAMS, ulPrivateDataLen);
109
+ PKCS11_IMPLEMENT_HANDLE_ACCESSOR(CK_X9_42_DH2_DERIVE_PARAMS, hPrivateData);
110
+ PKCS11_IMPLEMENT_ULONG_ACCESSOR(CK_X9_42_DH2_DERIVE_PARAMS, ulPublicDataLen2);
111
111
 
112
112
  PKCS11_IMPLEMENT_STRUCT_WITH_ALLOCATOR(CK_X9_42_MQV_DERIVE_PARAMS);
113
- PKCS11_IMPLEMENT_STRING_PTR_ACCESSOR(CK_X9_42_MQV_DERIVE_PARAMS, pPublicData2);
114
113
  PKCS11_IMPLEMENT_STRING_PTR_LEN_ACCESSOR(CK_X9_42_MQV_DERIVE_PARAMS, pOtherInfo, ulOtherInfoLen);
115
114
  PKCS11_IMPLEMENT_STRING_PTR_LEN_ACCESSOR(CK_X9_42_MQV_DERIVE_PARAMS, pPublicData, ulPublicDataLen);
116
- PKCS11_IMPLEMENT_HANDLE_ACCESSOR(CK_X9_42_MQV_DERIVE_PARAMS, publicKey);
117
- PKCS11_IMPLEMENT_ULONG_ACCESSOR(CK_X9_42_MQV_DERIVE_PARAMS, ulPublicDataLen2);
118
- PKCS11_IMPLEMENT_HANDLE_ACCESSOR(CK_X9_42_MQV_DERIVE_PARAMS, hPrivateData);
115
+ PKCS11_IMPLEMENT_STRING_PTR_ACCESSOR(CK_X9_42_MQV_DERIVE_PARAMS, pPublicData2);
119
116
  PKCS11_IMPLEMENT_ULONG_ACCESSOR(CK_X9_42_MQV_DERIVE_PARAMS, kdf);
120
117
  PKCS11_IMPLEMENT_ULONG_ACCESSOR(CK_X9_42_MQV_DERIVE_PARAMS, ulPrivateDataLen);
118
+ PKCS11_IMPLEMENT_HANDLE_ACCESSOR(CK_X9_42_MQV_DERIVE_PARAMS, hPrivateData);
119
+ PKCS11_IMPLEMENT_ULONG_ACCESSOR(CK_X9_42_MQV_DERIVE_PARAMS, ulPublicDataLen2);
120
+ PKCS11_IMPLEMENT_HANDLE_ACCESSOR(CK_X9_42_MQV_DERIVE_PARAMS, publicKey);
121
121
 
122
122
  PKCS11_IMPLEMENT_STRUCT_WITH_ALLOCATOR(CK_KEA_DERIVE_PARAMS);
123
123
  PKCS11_IMPLEMENT_STRING_PTR_ACCESSOR(CK_KEA_DERIVE_PARAMS, pRandomA);
124
124
  PKCS11_IMPLEMENT_STRING_PTR_ACCESSOR(CK_KEA_DERIVE_PARAMS, pRandomB);
125
125
  PKCS11_IMPLEMENT_STRING_PTR_LEN_ACCESSOR(CK_KEA_DERIVE_PARAMS, pPublicData, ulPublicDataLen);
126
- PKCS11_IMPLEMENT_ULONG_ACCESSOR(CK_KEA_DERIVE_PARAMS, ulRandomLen);
127
126
  PKCS11_IMPLEMENT_BOOL_ACCESSOR(CK_KEA_DERIVE_PARAMS, isSender);
127
+ PKCS11_IMPLEMENT_ULONG_ACCESSOR(CK_KEA_DERIVE_PARAMS, ulRandomLen);
128
128
 
129
129
  PKCS11_IMPLEMENT_STRUCT_WITH_ALLOCATOR(CK_RC2_CBC_PARAMS);
130
130
  PKCS11_IMPLEMENT_ULONG_ACCESSOR(CK_RC2_CBC_PARAMS, ulEffectiveBits);
131
131
  PKCS11_IMPLEMENT_STRING_ACCESSOR(CK_RC2_CBC_PARAMS, iv);
132
132
 
133
133
  PKCS11_IMPLEMENT_STRUCT_WITH_ALLOCATOR(CK_RC2_MAC_GENERAL_PARAMS);
134
- PKCS11_IMPLEMENT_ULONG_ACCESSOR(CK_RC2_MAC_GENERAL_PARAMS, ulMacLength);
135
134
  PKCS11_IMPLEMENT_ULONG_ACCESSOR(CK_RC2_MAC_GENERAL_PARAMS, ulEffectiveBits);
135
+ PKCS11_IMPLEMENT_ULONG_ACCESSOR(CK_RC2_MAC_GENERAL_PARAMS, ulMacLength);
136
136
 
137
137
  PKCS11_IMPLEMENT_STRUCT_WITH_ALLOCATOR(CK_RC5_PARAMS);
138
- PKCS11_IMPLEMENT_ULONG_ACCESSOR(CK_RC5_PARAMS, ulRounds);
139
138
  PKCS11_IMPLEMENT_ULONG_ACCESSOR(CK_RC5_PARAMS, ulWordsize);
139
+ PKCS11_IMPLEMENT_ULONG_ACCESSOR(CK_RC5_PARAMS, ulRounds);
140
140
 
141
141
  PKCS11_IMPLEMENT_STRUCT_WITH_ALLOCATOR(CK_RC5_CBC_PARAMS);
142
142
  PKCS11_IMPLEMENT_STRING_PTR_LEN_ACCESSOR(CK_RC5_CBC_PARAMS, pIv, ulIvLen);
143
- PKCS11_IMPLEMENT_ULONG_ACCESSOR(CK_RC5_CBC_PARAMS, ulRounds);
144
143
  PKCS11_IMPLEMENT_ULONG_ACCESSOR(CK_RC5_CBC_PARAMS, ulWordsize);
144
+ PKCS11_IMPLEMENT_ULONG_ACCESSOR(CK_RC5_CBC_PARAMS, ulRounds);
145
145
 
146
146
  PKCS11_IMPLEMENT_STRUCT_WITH_ALLOCATOR(CK_RC5_MAC_GENERAL_PARAMS);
147
- PKCS11_IMPLEMENT_ULONG_ACCESSOR(CK_RC5_MAC_GENERAL_PARAMS, ulMacLength);
148
- PKCS11_IMPLEMENT_ULONG_ACCESSOR(CK_RC5_MAC_GENERAL_PARAMS, ulRounds);
149
147
  PKCS11_IMPLEMENT_ULONG_ACCESSOR(CK_RC5_MAC_GENERAL_PARAMS, ulWordsize);
148
+ PKCS11_IMPLEMENT_ULONG_ACCESSOR(CK_RC5_MAC_GENERAL_PARAMS, ulRounds);
149
+ PKCS11_IMPLEMENT_ULONG_ACCESSOR(CK_RC5_MAC_GENERAL_PARAMS, ulMacLength);
150
150
 
151
151
  PKCS11_IMPLEMENT_STRUCT_WITH_ALLOCATOR(CK_DES_CBC_ENCRYPT_DATA_PARAMS);
152
152
  PKCS11_IMPLEMENT_STRING_PTR_LEN_ACCESSOR(CK_DES_CBC_ENCRYPT_DATA_PARAMS, pData, length);
@@ -157,30 +157,30 @@ PKCS11_IMPLEMENT_STRING_PTR_LEN_ACCESSOR(CK_AES_CBC_ENCRYPT_DATA_PARAMS, pData,
157
157
  PKCS11_IMPLEMENT_STRING_ACCESSOR(CK_AES_CBC_ENCRYPT_DATA_PARAMS, iv);
158
158
 
159
159
  PKCS11_IMPLEMENT_STRUCT_WITH_ALLOCATOR(CK_SKIPJACK_PRIVATE_WRAP_PARAMS);
160
- PKCS11_IMPLEMENT_STRING_PTR_ACCESSOR(CK_SKIPJACK_PRIVATE_WRAP_PARAMS, pRandomA);
161
- PKCS11_IMPLEMENT_STRING_PTR_ACCESSOR(CK_SKIPJACK_PRIVATE_WRAP_PARAMS, pBaseG);
162
- PKCS11_IMPLEMENT_STRING_PTR_LEN_ACCESSOR(CK_SKIPJACK_PRIVATE_WRAP_PARAMS, pPublicData, ulPublicDataLen);
163
160
  PKCS11_IMPLEMENT_STRING_PTR_LEN_ACCESSOR(CK_SKIPJACK_PRIVATE_WRAP_PARAMS, pPassword, ulPasswordLen);
161
+ PKCS11_IMPLEMENT_STRING_PTR_LEN_ACCESSOR(CK_SKIPJACK_PRIVATE_WRAP_PARAMS, pPublicData, ulPublicDataLen);
162
+ PKCS11_IMPLEMENT_STRING_PTR_ACCESSOR(CK_SKIPJACK_PRIVATE_WRAP_PARAMS, pRandomA);
164
163
  PKCS11_IMPLEMENT_STRING_PTR_ACCESSOR(CK_SKIPJACK_PRIVATE_WRAP_PARAMS, pPrimeP);
164
+ PKCS11_IMPLEMENT_STRING_PTR_ACCESSOR(CK_SKIPJACK_PRIVATE_WRAP_PARAMS, pBaseG);
165
165
  PKCS11_IMPLEMENT_STRING_PTR_ACCESSOR(CK_SKIPJACK_PRIVATE_WRAP_PARAMS, pSubprimeQ);
166
- PKCS11_IMPLEMENT_ULONG_ACCESSOR(CK_SKIPJACK_PRIVATE_WRAP_PARAMS, ulQLen);
167
166
  PKCS11_IMPLEMENT_ULONG_ACCESSOR(CK_SKIPJACK_PRIVATE_WRAP_PARAMS, ulPAndGLen);
167
+ PKCS11_IMPLEMENT_ULONG_ACCESSOR(CK_SKIPJACK_PRIVATE_WRAP_PARAMS, ulQLen);
168
168
  PKCS11_IMPLEMENT_ULONG_ACCESSOR(CK_SKIPJACK_PRIVATE_WRAP_PARAMS, ulRandomLen);
169
169
 
170
170
  PKCS11_IMPLEMENT_STRUCT_WITH_ALLOCATOR(CK_SKIPJACK_RELAYX_PARAMS);
171
+ PKCS11_IMPLEMENT_STRING_PTR_LEN_ACCESSOR(CK_SKIPJACK_RELAYX_PARAMS, pOldWrappedX, ulOldWrappedXLen);
172
+ PKCS11_IMPLEMENT_STRING_PTR_LEN_ACCESSOR(CK_SKIPJACK_RELAYX_PARAMS, pOldPassword, ulOldPasswordLen);
173
+ PKCS11_IMPLEMENT_STRING_PTR_LEN_ACCESSOR(CK_SKIPJACK_RELAYX_PARAMS, pOldPublicData, ulOldPublicDataLen);
174
+ PKCS11_IMPLEMENT_STRING_PTR_ACCESSOR(CK_SKIPJACK_RELAYX_PARAMS, pOldRandomA);
171
175
  PKCS11_IMPLEMENT_STRING_PTR_LEN_ACCESSOR(CK_SKIPJACK_RELAYX_PARAMS, pNewPassword, ulNewPasswordLen);
172
176
  PKCS11_IMPLEMENT_STRING_PTR_LEN_ACCESSOR(CK_SKIPJACK_RELAYX_PARAMS, pNewPublicData, ulNewPublicDataLen);
173
- PKCS11_IMPLEMENT_STRING_PTR_ACCESSOR(CK_SKIPJACK_RELAYX_PARAMS, pOldRandomA);
174
177
  PKCS11_IMPLEMENT_STRING_PTR_ACCESSOR(CK_SKIPJACK_RELAYX_PARAMS, pNewRandomA);
175
- PKCS11_IMPLEMENT_STRING_PTR_LEN_ACCESSOR(CK_SKIPJACK_RELAYX_PARAMS, pOldPublicData, ulOldPublicDataLen);
176
- PKCS11_IMPLEMENT_STRING_PTR_LEN_ACCESSOR(CK_SKIPJACK_RELAYX_PARAMS, pOldPassword, ulOldPasswordLen);
177
- PKCS11_IMPLEMENT_STRING_PTR_LEN_ACCESSOR(CK_SKIPJACK_RELAYX_PARAMS, pOldWrappedX, ulOldWrappedXLen);
178
178
  PKCS11_IMPLEMENT_ULONG_ACCESSOR(CK_SKIPJACK_RELAYX_PARAMS, ulOldRandomLen);
179
179
  PKCS11_IMPLEMENT_ULONG_ACCESSOR(CK_SKIPJACK_RELAYX_PARAMS, ulNewRandomLen);
180
180
 
181
181
  PKCS11_IMPLEMENT_STRUCT_WITH_ALLOCATOR(CK_PBE_PARAMS);
182
- PKCS11_IMPLEMENT_STRING_PTR_LEN_ACCESSOR(CK_PBE_PARAMS, pPassword, ulPasswordLen);
183
182
  PKCS11_IMPLEMENT_STRING_PTR_ACCESSOR(CK_PBE_PARAMS, pInitVector);
183
+ PKCS11_IMPLEMENT_STRING_PTR_LEN_ACCESSOR(CK_PBE_PARAMS, pPassword, ulPasswordLen);
184
184
  PKCS11_IMPLEMENT_STRING_PTR_LEN_ACCESSOR(CK_PBE_PARAMS, pSalt, ulSaltLen);
185
185
  PKCS11_IMPLEMENT_ULONG_ACCESSOR(CK_PBE_PARAMS, ulIteration);
186
186
 
@@ -199,23 +199,23 @@ PKCS11_IMPLEMENT_STRUCT_PTR_ACCESSOR(CK_SSL3_MASTER_KEY_DERIVE_PARAMS, CK_VERSIO
199
199
  PKCS11_IMPLEMENT_STRUCT_WITH_ALLOCATOR(CK_SSL3_KEY_MAT_OUT);
200
200
  PKCS11_IMPLEMENT_STRING_PTR_ACCESSOR(CK_SSL3_KEY_MAT_OUT, pIVClient);
201
201
  PKCS11_IMPLEMENT_STRING_PTR_ACCESSOR(CK_SSL3_KEY_MAT_OUT, pIVServer);
202
- PKCS11_IMPLEMENT_HANDLE_ACCESSOR(CK_SSL3_KEY_MAT_OUT, hServerKey);
202
+ PKCS11_IMPLEMENT_HANDLE_ACCESSOR(CK_SSL3_KEY_MAT_OUT, hClientMacSecret);
203
203
  PKCS11_IMPLEMENT_HANDLE_ACCESSOR(CK_SSL3_KEY_MAT_OUT, hServerMacSecret);
204
204
  PKCS11_IMPLEMENT_HANDLE_ACCESSOR(CK_SSL3_KEY_MAT_OUT, hClientKey);
205
- PKCS11_IMPLEMENT_HANDLE_ACCESSOR(CK_SSL3_KEY_MAT_OUT, hClientMacSecret);
205
+ PKCS11_IMPLEMENT_HANDLE_ACCESSOR(CK_SSL3_KEY_MAT_OUT, hServerKey);
206
206
 
207
207
  PKCS11_IMPLEMENT_STRUCT_WITH_ALLOCATOR(CK_SSL3_KEY_MAT_PARAMS);
208
- PKCS11_IMPLEMENT_STRUCT_ACCESSOR(CK_SSL3_KEY_MAT_PARAMS, CK_SSL3_RANDOM_DATA, RandomInfo);
209
- PKCS11_IMPLEMENT_ULONG_ACCESSOR(CK_SSL3_KEY_MAT_PARAMS, ulIVSizeInBits);
210
- PKCS11_IMPLEMENT_ULONG_ACCESSOR(CK_SSL3_KEY_MAT_PARAMS, ulKeySizeInBits);
211
208
  PKCS11_IMPLEMENT_ULONG_ACCESSOR(CK_SSL3_KEY_MAT_PARAMS, ulMacSizeInBits);
212
- PKCS11_IMPLEMENT_STRUCT_PTR_ACCESSOR(CK_SSL3_KEY_MAT_PARAMS, CK_SSL3_KEY_MAT_OUT, pReturnedKeyMaterial);
209
+ PKCS11_IMPLEMENT_ULONG_ACCESSOR(CK_SSL3_KEY_MAT_PARAMS, ulKeySizeInBits);
210
+ PKCS11_IMPLEMENT_ULONG_ACCESSOR(CK_SSL3_KEY_MAT_PARAMS, ulIVSizeInBits);
213
211
  PKCS11_IMPLEMENT_BOOL_ACCESSOR(CK_SSL3_KEY_MAT_PARAMS, bIsExport);
212
+ PKCS11_IMPLEMENT_STRUCT_ACCESSOR(CK_SSL3_KEY_MAT_PARAMS, CK_SSL3_RANDOM_DATA, RandomInfo);
213
+ PKCS11_IMPLEMENT_STRUCT_PTR_ACCESSOR(CK_SSL3_KEY_MAT_PARAMS, CK_SSL3_KEY_MAT_OUT, pReturnedKeyMaterial);
214
214
 
215
215
  PKCS11_IMPLEMENT_STRUCT_WITH_ALLOCATOR(CK_TLS_PRF_PARAMS);
216
+ PKCS11_IMPLEMENT_STRING_PTR_LEN_ACCESSOR(CK_TLS_PRF_PARAMS, pSeed, ulSeedLen);
216
217
  PKCS11_IMPLEMENT_STRING_PTR_LEN_ACCESSOR(CK_TLS_PRF_PARAMS, pLabel, ulLabelLen);
217
218
  PKCS11_IMPLEMENT_STRING_PTR_ACCESSOR(CK_TLS_PRF_PARAMS, pOutput);
218
- PKCS11_IMPLEMENT_STRING_PTR_LEN_ACCESSOR(CK_TLS_PRF_PARAMS, pSeed, ulSeedLen);
219
219
  PKCS11_IMPLEMENT_ULONG_PTR_ACCESSOR(CK_TLS_PRF_PARAMS, pulOutputLen);
220
220
 
221
221
  PKCS11_IMPLEMENT_STRUCT_WITH_ALLOCATOR(CK_WTLS_RANDOM_DATA);
@@ -228,9 +228,9 @@ PKCS11_IMPLEMENT_ULONG_ACCESSOR(CK_WTLS_MASTER_KEY_DERIVE_PARAMS, DigestMechanis
228
228
  PKCS11_IMPLEMENT_STRUCT_ACCESSOR(CK_WTLS_MASTER_KEY_DERIVE_PARAMS, CK_WTLS_RANDOM_DATA, RandomInfo);
229
229
 
230
230
  PKCS11_IMPLEMENT_STRUCT_WITH_ALLOCATOR(CK_WTLS_PRF_PARAMS);
231
+ PKCS11_IMPLEMENT_STRING_PTR_LEN_ACCESSOR(CK_WTLS_PRF_PARAMS, pSeed, ulSeedLen);
231
232
  PKCS11_IMPLEMENT_STRING_PTR_LEN_ACCESSOR(CK_WTLS_PRF_PARAMS, pLabel, ulLabelLen);
232
233
  PKCS11_IMPLEMENT_STRING_PTR_ACCESSOR(CK_WTLS_PRF_PARAMS, pOutput);
233
- PKCS11_IMPLEMENT_STRING_PTR_LEN_ACCESSOR(CK_WTLS_PRF_PARAMS, pSeed, ulSeedLen);
234
234
  PKCS11_IMPLEMENT_ULONG_ACCESSOR(CK_WTLS_PRF_PARAMS, DigestMechanism);
235
235
  PKCS11_IMPLEMENT_ULONG_PTR_ACCESSOR(CK_WTLS_PRF_PARAMS, pulOutputLen);
236
236
 
@@ -240,46 +240,44 @@ PKCS11_IMPLEMENT_HANDLE_ACCESSOR(CK_WTLS_KEY_MAT_OUT, hMacSecret);
240
240
  PKCS11_IMPLEMENT_HANDLE_ACCESSOR(CK_WTLS_KEY_MAT_OUT, hKey);
241
241
 
242
242
  PKCS11_IMPLEMENT_STRUCT_WITH_ALLOCATOR(CK_WTLS_KEY_MAT_PARAMS);
243
- PKCS11_IMPLEMENT_ULONG_ACCESSOR(CK_WTLS_KEY_MAT_PARAMS, ulSequenceNumber);
244
243
  PKCS11_IMPLEMENT_ULONG_ACCESSOR(CK_WTLS_KEY_MAT_PARAMS, DigestMechanism);
245
- PKCS11_IMPLEMENT_STRUCT_ACCESSOR(CK_WTLS_KEY_MAT_PARAMS, CK_WTLS_RANDOM_DATA, RandomInfo);
246
- PKCS11_IMPLEMENT_ULONG_ACCESSOR(CK_WTLS_KEY_MAT_PARAMS, ulIVSizeInBits);
247
- PKCS11_IMPLEMENT_STRUCT_PTR_ACCESSOR(CK_WTLS_KEY_MAT_PARAMS, CK_WTLS_KEY_MAT_OUT, pReturnedKeyMaterial);
248
- PKCS11_IMPLEMENT_ULONG_ACCESSOR(CK_WTLS_KEY_MAT_PARAMS, ulKeySizeInBits);
249
244
  PKCS11_IMPLEMENT_ULONG_ACCESSOR(CK_WTLS_KEY_MAT_PARAMS, ulMacSizeInBits);
245
+ PKCS11_IMPLEMENT_ULONG_ACCESSOR(CK_WTLS_KEY_MAT_PARAMS, ulKeySizeInBits);
246
+ PKCS11_IMPLEMENT_ULONG_ACCESSOR(CK_WTLS_KEY_MAT_PARAMS, ulIVSizeInBits);
247
+ PKCS11_IMPLEMENT_ULONG_ACCESSOR(CK_WTLS_KEY_MAT_PARAMS, ulSequenceNumber);
250
248
  PKCS11_IMPLEMENT_BOOL_ACCESSOR(CK_WTLS_KEY_MAT_PARAMS, bIsExport);
249
+ PKCS11_IMPLEMENT_STRUCT_ACCESSOR(CK_WTLS_KEY_MAT_PARAMS, CK_WTLS_RANDOM_DATA, RandomInfo);
250
+ PKCS11_IMPLEMENT_STRUCT_PTR_ACCESSOR(CK_WTLS_KEY_MAT_PARAMS, CK_WTLS_KEY_MAT_OUT, pReturnedKeyMaterial);
251
251
 
252
252
  PKCS11_IMPLEMENT_STRUCT_WITH_ALLOCATOR(CK_CMS_SIG_PARAMS);
253
- PKCS11_IMPLEMENT_STRING_PTR_LEN_ACCESSOR(CK_CMS_SIG_PARAMS, pRequestedAttributes, ulRequestedAttributesLen);
254
253
  PKCS11_IMPLEMENT_STRING_PTR_ACCESSOR(CK_CMS_SIG_PARAMS, pContentType);
254
+ PKCS11_IMPLEMENT_STRING_PTR_LEN_ACCESSOR(CK_CMS_SIG_PARAMS, pRequestedAttributes, ulRequestedAttributesLen);
255
255
  PKCS11_IMPLEMENT_STRING_PTR_LEN_ACCESSOR(CK_CMS_SIG_PARAMS, pRequiredAttributes, ulRequiredAttributesLen);
256
- PKCS11_IMPLEMENT_STRUCT_PTR_ACCESSOR(CK_CMS_SIG_PARAMS, CK_MECHANISM, pDigestMechanism);
257
- PKCS11_IMPLEMENT_STRUCT_PTR_ACCESSOR(CK_CMS_SIG_PARAMS, CK_MECHANISM, pSigningMechanism);
258
256
  PKCS11_IMPLEMENT_HANDLE_ACCESSOR(CK_CMS_SIG_PARAMS, certificateHandle);
257
+ PKCS11_IMPLEMENT_STRUCT_PTR_ACCESSOR(CK_CMS_SIG_PARAMS, CK_MECHANISM, pSigningMechanism);
258
+ PKCS11_IMPLEMENT_STRUCT_PTR_ACCESSOR(CK_CMS_SIG_PARAMS, CK_MECHANISM, pDigestMechanism);
259
259
 
260
260
  PKCS11_IMPLEMENT_STRUCT_WITH_ALLOCATOR(CK_KEY_DERIVATION_STRING_DATA);
261
261
  PKCS11_IMPLEMENT_STRING_PTR_LEN_ACCESSOR(CK_KEY_DERIVATION_STRING_DATA, pData, ulLen);
262
262
 
263
263
  PKCS11_IMPLEMENT_STRUCT_WITH_ALLOCATOR(CK_PKCS5_PBKD2_PARAMS);
264
264
  PKCS11_IMPLEMENT_STRING_PTR_LEN_ACCESSOR(CK_PKCS5_PBKD2_PARAMS, pSaltSourceData, ulSaltSourceDataLen);
265
- PKCS11_IMPLEMENT_STRING_PTR_ACCESSOR(CK_PKCS5_PBKD2_PARAMS, pPassword);
266
265
  PKCS11_IMPLEMENT_STRING_PTR_LEN_ACCESSOR(CK_PKCS5_PBKD2_PARAMS, pPrfData, ulPrfDataLen);
266
+ PKCS11_IMPLEMENT_STRING_PTR_ACCESSOR(CK_PKCS5_PBKD2_PARAMS, pPassword);
267
267
  PKCS11_IMPLEMENT_ULONG_ACCESSOR(CK_PKCS5_PBKD2_PARAMS, saltSource);
268
- PKCS11_IMPLEMENT_ULONG_PTR_ACCESSOR(CK_PKCS5_PBKD2_PARAMS, ulPasswordLen);
269
- PKCS11_IMPLEMENT_ULONG_ACCESSOR(CK_PKCS5_PBKD2_PARAMS, prf);
270
268
  PKCS11_IMPLEMENT_ULONG_ACCESSOR(CK_PKCS5_PBKD2_PARAMS, iterations);
269
+ PKCS11_IMPLEMENT_ULONG_ACCESSOR(CK_PKCS5_PBKD2_PARAMS, prf);
270
+ PKCS11_IMPLEMENT_ULONG_PTR_ACCESSOR(CK_PKCS5_PBKD2_PARAMS, ulPasswordLen);
271
271
 
272
272
  PKCS11_IMPLEMENT_STRUCT_WITH_ALLOCATOR(CK_OTP_PARAM);
273
273
  PKCS11_IMPLEMENT_STRING_PTR_LEN_ACCESSOR(CK_OTP_PARAM, pValue, ulValueLen);
274
274
  PKCS11_IMPLEMENT_ULONG_ACCESSOR(CK_OTP_PARAM, type);
275
275
 
276
276
  PKCS11_IMPLEMENT_STRUCT_WITH_ALLOCATOR(CK_OTP_PARAMS);
277
- PKCS11_IMPLEMENT_ULONG_ACCESSOR(CK_OTP_PARAMS, ulCount);
278
- PKCS11_IMPLEMENT_STRUCT_PTR_ACCESSOR(CK_OTP_PARAMS, CK_OTP_PARAM, pParams);
277
+ PKCS11_IMPLEMENT_STRUCT_PTR_ARRAY_ACCESSOR(CK_OTP_PARAMS, CK_OTP_PARAM, pParams, ulCount);
279
278
 
280
279
  PKCS11_IMPLEMENT_STRUCT_WITH_ALLOCATOR(CK_OTP_SIGNATURE_INFO);
281
- PKCS11_IMPLEMENT_ULONG_ACCESSOR(CK_OTP_SIGNATURE_INFO, ulCount);
282
- PKCS11_IMPLEMENT_STRUCT_PTR_ACCESSOR(CK_OTP_SIGNATURE_INFO, CK_OTP_PARAM, pParams);
280
+ PKCS11_IMPLEMENT_STRUCT_PTR_ARRAY_ACCESSOR(CK_OTP_SIGNATURE_INFO, CK_OTP_PARAM, pParams, ulCount);
283
281
 
284
282
  PKCS11_IMPLEMENT_STRUCT_WITH_ALLOCATOR(CK_KIP_PARAMS);
285
283
  PKCS11_IMPLEMENT_STRING_PTR_LEN_ACCESSOR(CK_KIP_PARAMS, pSeed, ulSeedLen);
@@ -287,12 +285,12 @@ PKCS11_IMPLEMENT_STRUCT_PTR_ACCESSOR(CK_KIP_PARAMS, CK_MECHANISM, pMechanism);
287
285
  PKCS11_IMPLEMENT_HANDLE_ACCESSOR(CK_KIP_PARAMS, hKey);
288
286
 
289
287
  PKCS11_IMPLEMENT_STRUCT_WITH_ALLOCATOR(CK_AES_CTR_PARAMS);
290
- PKCS11_IMPLEMENT_STRING_ACCESSOR(CK_AES_CTR_PARAMS, cb);
291
288
  PKCS11_IMPLEMENT_ULONG_ACCESSOR(CK_AES_CTR_PARAMS, ulCounterBits);
289
+ PKCS11_IMPLEMENT_STRING_ACCESSOR(CK_AES_CTR_PARAMS, cb);
292
290
 
293
291
  PKCS11_IMPLEMENT_STRUCT_WITH_ALLOCATOR(CK_CAMELLIA_CTR_PARAMS);
294
- PKCS11_IMPLEMENT_STRING_ACCESSOR(CK_CAMELLIA_CTR_PARAMS, cb);
295
292
  PKCS11_IMPLEMENT_ULONG_ACCESSOR(CK_CAMELLIA_CTR_PARAMS, ulCounterBits);
293
+ PKCS11_IMPLEMENT_STRING_ACCESSOR(CK_CAMELLIA_CTR_PARAMS, cb);
296
294
 
297
295
  PKCS11_IMPLEMENT_STRUCT_WITH_ALLOCATOR(CK_CAMELLIA_CBC_ENCRYPT_DATA_PARAMS);
298
296
  PKCS11_IMPLEMENT_STRING_PTR_LEN_ACCESSOR(CK_CAMELLIA_CBC_ENCRYPT_DATA_PARAMS, pData, length);