Same as other patches in this series, use C macros defined at build time to resolve directories.
Signed-off-by: Klaus Heinrich Kiwi <[email protected]> --- configure.in | 1 - usr/lib/pkcs11/cca_stdll/tok_struct.h | 73 ++++++++++++++++++++++++++++++ usr/lib/pkcs11/cca_stdll/tok_struct.h.in | 63 ------------------------- 3 files changed, 73 insertions(+), 64 deletions(-) create mode 100644 usr/lib/pkcs11/cca_stdll/tok_struct.h delete mode 100644 usr/lib/pkcs11/cca_stdll/tok_struct.h.in diff --git a/configure.in b/configure.in index 9279c7c..9f079af 100644 --- a/configure.in +++ b/configure.in @@ -287,7 +287,6 @@ AC_OUTPUT([Makefile usr/Makefile \ usr/lib/pkcs11/tpm_stdll/Makefile \ usr/lib/pkcs11/tpm_stdll/tok_struct.h \ usr/lib/pkcs11/cca_stdll/Makefile \ - usr/lib/pkcs11/cca_stdll/tok_struct.h \ usr/lib/pkcs11/methods/4758_status/Makefile \ misc/Makefile \ testcases/Makefile \ diff --git a/usr/lib/pkcs11/cca_stdll/tok_struct.h b/usr/lib/pkcs11/cca_stdll/tok_struct.h new file mode 100644 index 0000000..87e7ad0 --- /dev/null +++ b/usr/lib/pkcs11/cca_stdll/tok_struct.h @@ -0,0 +1,73 @@ + +/* + * Licensed materials, Property of IBM Corp. + * + * openCryptoki CCA token + * + * (C) COPYRIGHT International Business Machines Corp. 2001, 2002, 2006 + * + */ + +#ifndef __TOK_STRUCT_H +#define __TOK_STRUCT_H +#include <pkcs11types.h> + +#include "tok_spec_struct.h" + +#ifndef CCA_CONFIG_PATH + +#ifndef CONFIG_PATH +#warning CONFIG_PATH not set, using default (/usr/local/var/lib/opencryptoki) +#define CONFIG_PATH "/usr/local/var/lib/opencryptoki" +#endif // #ifndef CONFIG_PATH + +#define CCA_CONFIG_PATH CONFIG_PATH "/ccatok" +#endif // #ifndef CCA_CONFIG_PATH + +token_spec_t token_specific = { + CCA_CONFIG_PATH, + "ccatok", + "CCA_STDLL_Debug", + &token_specific_init, + &tok_slot2local, + &token_rng, + &token_specific_session, + &token_specific_final, + &token_specific_des_key_gen, + &token_specific_des_ecb, + &token_specific_des_cbc, + + &token_specific_tdes_ecb, + &token_specific_tdes_cbc, + + &token_specific_rsa_decrypt, + &token_specific_rsa_encrypt, + &token_specific_rsa_sign, + &token_specific_rsa_verify, + &token_specific_rsa_generate_keypair, +#ifndef NODH +/* Begin code contributed by Corrent corp. */ + // DH + &token_specific_dh_pkcs_derive, + &token_specific_dh_pkcs_key_pair_gen, +/* End code contributed by Corrent corp. */ +#endif + // SHA-1 + NULL, + NULL, + NULL, + // SHA-256 + NULL, + NULL, + NULL, +#ifndef NOAES + // AES + &token_specific_aes_key_gen, + &token_specific_aes_ecb, + &token_specific_aes_cbc, +#endif + &token_specific_get_mechanism_list, + &token_specific_get_mechanism_info +}; + +#endif diff --git a/usr/lib/pkcs11/cca_stdll/tok_struct.h.in b/usr/lib/pkcs11/cca_stdll/tok_struct.h.in deleted file mode 100644 index 9fccf8a..0000000 --- a/usr/lib/pkcs11/cca_stdll/tok_struct.h.in +++ /dev/null @@ -1,63 +0,0 @@ - -/* - * Licensed materials, Property of IBM Corp. - * - * openCryptoki CCA token - * - * (C) COPYRIGHT International Business Machines Corp. 2001, 2002, 2006 - * - */ - -#ifndef __TOK_STRUCT_H -#define __TOK_STRUCT_H -#include <pkcs11types.h> - -#include "tok_spec_struct.h" - -token_spec_t token_specific = { - "@DB_PATH@/ccatok", - "ccatok", - "CCA_STDLL_Debug", - &token_specific_init, - &tok_slot2local, - &token_rng, - &token_specific_session, - &token_specific_final, - &token_specific_des_key_gen, - &token_specific_des_ecb, - &token_specific_des_cbc, - - &token_specific_tdes_ecb, - &token_specific_tdes_cbc, - - &token_specific_rsa_decrypt, - &token_specific_rsa_encrypt, - &token_specific_rsa_sign, - &token_specific_rsa_verify, - &token_specific_rsa_generate_keypair, -#ifndef NODH -/* Begin code contributed by Corrent corp. */ - // DH - &token_specific_dh_pkcs_derive, - &token_specific_dh_pkcs_key_pair_gen, -/* End code contributed by Corrent corp. */ -#endif - // SHA-1 - NULL, - NULL, - NULL, - // SHA-256 - NULL, - NULL, - NULL, -#ifndef NOAES - // AES - &token_specific_aes_key_gen, - &token_specific_aes_ecb, - &token_specific_aes_cbc, -#endif - &token_specific_get_mechanism_list, - &token_specific_get_mechanism_info -}; - -#endif -- 1.6.2.5 ------------------------------------------------------------------------------ Come build with us! The BlackBerry® Developer Conference in SF, CA is the only developer event you need to attend this year. Jumpstart your developing skills, take BlackBerry mobile applications to market and stay ahead of the curve. Join us from November 9-12, 2009. Register now! http://p.sf.net/sfu/devconf _______________________________________________ Opencryptoki-tech mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/opencryptoki-tech
