Diff

Differences From Artifact [67c147948d]:

To Artifact [3299bf8a7b]:


219
220
221
222
223
224
225



226
227
228
229
230
231
232
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235







+
+
+







 * this should best be defined by
 *
 * #ifndef NULL_PTR
 * #define NULL_PTR 0
 * #endif
 */

#ifdef _WIN32
#pragma pack(push, cryptoki, 1)
#endif

/* All the various Cryptoki types and #define'd values are in the
 * file pkcs11t.h. */
#include "pkcs11t.h"

#define __PASTE(x,y)      x##y

285
286
287
288
289
290
291




292
293
294
295
296
297
298
299
300
301
302
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309







+
+
+
+












/* Pile all the function pointers into the CK_FUNCTION_LIST. */
/* pkcs11f.h has all the information about the Cryptoki
 * function prototypes. */
#include "pkcs11f.h"

};

#ifdef _WIN32
#pragma pack(pop, cryptoki)
#endif

#undef CK_PKCS11_FUNCTION_INFO


#undef __PASTE

#ifdef __cplusplus
}
#endif

#endif