mirror of
https://gitlab.isc.org/isc-projects/bind9
synced 2025-08-30 14:07:59 +00:00
Now that include files are in place in the opencryptoki subdirectory,
remove "#ifndef OPENCRYPTOKI" conditionals
This commit is contained in:
@@ -7,12 +7,7 @@
|
|||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
#ifndef OPENCRYPTOKI
|
|
||||||
#include <security/cryptoki.h>
|
|
||||||
#include <security/pkcs11.h>
|
|
||||||
#else
|
|
||||||
#include <opencryptoki/pkcs11.h>
|
#include <opencryptoki/pkcs11.h>
|
||||||
#endif
|
|
||||||
|
|
||||||
int
|
int
|
||||||
main(int argc, char *argv[])
|
main(int argc, char *argv[])
|
||||||
|
@@ -17,12 +17,7 @@
|
|||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
#ifndef OPENCRYPTOKI
|
|
||||||
#include <security/cryptoki.h>
|
|
||||||
#include <security/pkcs11.h>
|
|
||||||
#else
|
|
||||||
#include <opencryptoki/pkcs11.h>
|
#include <opencryptoki/pkcs11.h>
|
||||||
#endif
|
|
||||||
|
|
||||||
/* Define static key template values */
|
/* Define static key template values */
|
||||||
static CK_BBOOL truevalue = TRUE;
|
static CK_BBOOL truevalue = TRUE;
|
||||||
|
@@ -7,12 +7,7 @@
|
|||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
#ifndef OPENCRYPTOKI
|
|
||||||
#include <security/cryptoki.h>
|
|
||||||
#include <security/pkcs11.h>
|
|
||||||
#else
|
|
||||||
#include <opencryptoki/pkcs11.h>
|
#include <opencryptoki/pkcs11.h>
|
||||||
#endif
|
|
||||||
|
|
||||||
int
|
int
|
||||||
main(int argc, char *argv[])
|
main(int argc, char *argv[])
|
||||||
|
@@ -7,12 +7,7 @@
|
|||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
#ifndef OPENCRYPTOKI
|
|
||||||
#include <security/cryptoki.h>
|
|
||||||
#include <security/pkcs11.h>
|
|
||||||
#else
|
|
||||||
#include <opencryptoki/pkcs11.h>
|
#include <opencryptoki/pkcs11.h>
|
||||||
#endif
|
|
||||||
#include <openssl/conf.h>
|
#include <openssl/conf.h>
|
||||||
#include <openssl/err.h>
|
#include <openssl/err.h>
|
||||||
#include <openssl/rsa.h>
|
#include <openssl/rsa.h>
|
||||||
|
@@ -7,12 +7,7 @@
|
|||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
#ifndef OPENCRYPTOKI
|
|
||||||
#include <security/cryptoki.h>
|
|
||||||
#include <security/pkcs11.h>
|
|
||||||
#else
|
|
||||||
#include <opencryptoki/pkcs11.h>
|
#include <opencryptoki/pkcs11.h>
|
||||||
#endif
|
|
||||||
|
|
||||||
int
|
int
|
||||||
main(int argc, char *argv[])
|
main(int argc, char *argv[])
|
||||||
|
@@ -7,12 +7,7 @@
|
|||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
#ifndef OPENCRYPTOKI
|
|
||||||
#include <security/cryptoki.h>
|
|
||||||
#include <security/pkcs11.h>
|
|
||||||
#else
|
|
||||||
#include <opencryptoki/pkcs11.h>
|
#include <opencryptoki/pkcs11.h>
|
||||||
#endif
|
|
||||||
#include <openssl/conf.h>
|
#include <openssl/conf.h>
|
||||||
#include <openssl/engine.h>
|
#include <openssl/engine.h>
|
||||||
#include <openssl/err.h>
|
#include <openssl/err.h>
|
||||||
|
Reference in New Issue
Block a user