diff options
| author | Stef Walter <stef@memberwebs.com> | 2010-01-06 14:20:48 +0000 |
|---|---|---|
| committer | Stef Walter <stef@memberwebs.com> | 2010-01-06 14:20:48 +0000 |
| commit | da12b4f09752f192eb66a2a044e40a086025237c (patch) | |
| tree | 21ff3753a9f0fe7632b1a4e04a9d6a62670c0880 /module | |
| parent | 19e2998a5c0d5144f3dc87db8969d6d4c957a2c1 (diff) | |
Diffstat (limited to 'module')
| -rw-r--r-- | module/Makefile.am | 12 | ||||
| -rw-r--r-- | module/p11-constants.c (renamed from module/cryptoki-constants.c) | 0 | ||||
| -rw-r--r-- | module/p11-log.c (renamed from module/cryptoki-log.c) | 14 |
3 files changed, 13 insertions, 13 deletions
diff --git a/module/Makefile.am b/module/Makefile.am index ed0a17b..7510b34 100644 --- a/module/Makefile.am +++ b/module/Makefile.am @@ -1,15 +1,15 @@ -MODULE_SRCS = cryptoki-log.c -EXTRA_DIST = cryptoki-constants.c export.map +MODULE_SRCS = p11-log.c +EXTRA_DIST = p11-constants.c export.map -lib_LTLIBRARIES = cryptoki-log.la -cryptoki_log_la_LDFLAGS = \ +lib_LTLIBRARIES = p11-log.la +p11_log_la_LDFLAGS = \ -module \ -version-info 0:0:0 \ -Wl,--no-undefined \ -Wl,--version-script=$(srcdir)/export.map -cryptoki_log_la_CFLAGS = \ +p11_log_la_CFLAGS = \ -I$(top_srcdir)/pkcs11 -I. -cryptoki_log_la_SOURCES = $(MODULE_SRCS) +p11_log_la_SOURCES = $(MODULE_SRCS) diff --git a/module/cryptoki-constants.c b/module/p11-constants.c index d13488f..d13488f 100644 --- a/module/cryptoki-constants.c +++ b/module/p11-constants.c diff --git a/module/cryptoki-log.c b/module/p11-log.c index c03a016..5061546 100644 --- a/module/cryptoki-log.c +++ b/module/p11-log.c @@ -164,7 +164,7 @@ cklog(const char* msg, ...) } /* The constant logging */ -#include "cryptoki-constants.c" +#include "p11-constants.c" static void log_some_bytes (CK_BYTE_PTR arr, CK_ULONG num) @@ -712,7 +712,7 @@ CL_C_Initialize (CK_VOID_PTR pInitArgs) fclose (output_file); output_file = stderr; - output = getenv("CRYPTOKI_LOG_FILE"); + output = getenv("P11_LOG_FILE"); if (output && !output[0]) output = NULL; if (output) { @@ -728,9 +728,9 @@ CL_C_Initialize (CK_VOID_PTR pInitArgs) #endif /* Load the other module */ - module = getenv("CRYPTOKI_LOG_MODULE"); + module = getenv("P11_LOG_MODULE"); if (!module || !module[0]) { - cklog ("CRYPTOKI_LOG_MODULE not set\n"); + cklog ("P11_LOG_MODULE not set\n"); return CKR_DEVICE_ERROR; } @@ -791,10 +791,10 @@ CL_C_Initialize (CK_VOID_PTR pInitArgs) return CKR_CANT_LOCK; } - cklog ("INITIALIZE cryptoki-log debugging (%s / %s)\n", + cklog ("INITIALIZE p11-log debugging (%s / %s)\n", module, output ? output : "ods"); #else - cklog ("INITIALIZE cryptoki-log debugging (%s / %s)\n", + cklog ("INITIALIZE p11-log debugging (%s / %s)\n", module, output ? output : "stderr"); #endif @@ -814,7 +814,7 @@ CL_C_Finalize (CK_VOID_PTR pReserved) PROCESS_CALL ((pReserved)) DONE_CALL - cklog ("FINALIZE cryptoki-log debugging\n"); + cklog ("FINALIZE p11-log debugging\n"); } static CK_RV |