---
usr/lib/pkcs11/cca_stdll/h_extern.h | 16 ++--------------
usr/lib/pkcs11/tpm_stdll/h_extern.h | 23 ++++++++++++-----------
2 files changed, 14 insertions(+), 25 deletions(-)
diff --git a/usr/lib/pkcs11/cca_stdll/h_extern.h
b/usr/lib/pkcs11/cca_stdll/h_extern.h
index 10483b2..4aac772 100644
--- a/usr/lib/pkcs11/cca_stdll/h_extern.h
+++ b/usr/lib/pkcs11/cca_stdll/h_extern.h
@@ -33,6 +33,7 @@
#endif
+
extern char * pk_dir;
// global variables
//
@@ -743,17 +744,7 @@ CK_RV rsa_hash_pkcs_verify_final ( SESSION *
sess,
// RSA mechanisms
//
CK_RV ckm_rsa_key_pair_gen( TEMPLATE *publ_tmpl, TEMPLATE *priv_tmpl );
-#if 0
-CK_RV ckm_rsa_encrypt( CK_BYTE * in_data,
- CK_ULONG in_data_len,
- CK_BYTE * out_data,
- OBJECT * key_obj );
-CK_RV ckm_rsa_decrypt( CK_BYTE * in_data,
- CK_ULONG in_data_len,
- CK_BYTE * out_data,
- OBJECT * key_obj );
-#else
CK_RV ckm_rsa_encrypt( CK_BYTE * in_data,
CK_ULONG in_data_len,
CK_BYTE * out_data,
@@ -777,7 +768,6 @@ CK_RV ckm_rsa_verify( CK_BYTE * in_data,
CK_BYTE * out_data,
CK_ULONG out_data_len,
OBJECT * key_obj );
-#endif
CK_RV ckm_rsa_compute_priv_exp( TEMPLATE *tmpl );
@@ -1553,10 +1543,10 @@ CK_RV verify_mgr_verify_final( SESSION
* sess,
//
CK_RV session_mgr_close_all_sessions( void );
CK_RV session_mgr_close_session( CK_SESSION_HANDLE );
+CK_RV session_mgr_new( CK_ULONG flags, CK_SLOT_ID slot_id,
CK_SESSION_HANDLE_PTR phSession );
SESSION * session_mgr_find( CK_SESSION_HANDLE handle );
CK_RV session_mgr_login_all ( CK_USER_TYPE user_type );
CK_RV session_mgr_logout_all( void );
-CK_RV session_mgr_new( CK_ULONG flags, CK_SLOT_ID, CK_SESSION_HANDLE_PTR );
CK_BBOOL session_mgr_readonly_session_exists( void );
CK_BBOOL session_mgr_so_session_exists ( void );
@@ -1749,7 +1739,6 @@ CK_RV object_restore_withSize( CK_BYTE * data,
CK_BBOOL replace,
int data_size );
-
CK_RV object_set_attribute_values( OBJECT * obj,
CK_ATTRIBUTE * pTemplate,
CK_ULONG ulCount );
@@ -1761,7 +1750,6 @@ CK_BBOOL object_is_token_object ( OBJECT * obj );
CK_BBOOL object_is_session_object( OBJECT * obj );
-
// object attribute template routines
//
diff --git a/usr/lib/pkcs11/tpm_stdll/h_extern.h
b/usr/lib/pkcs11/tpm_stdll/h_extern.h
index ee81d07..bfd2085 100644
--- a/usr/lib/pkcs11/tpm_stdll/h_extern.h
+++ b/usr/lib/pkcs11/tpm_stdll/h_extern.h
@@ -36,6 +36,8 @@
#ifndef _H_EXTERN_H
#define _H_EXTERN_H
+#include <stdio.h>
+
#if (LEEDS_BUILD)
#pragma options align=packed
#endif
@@ -2028,8 +2030,7 @@ extern const token_spec_t token_specific;
#pragma options align=full
#endif
-#include <stdio.h>
-#define APPID "TPM_STDLL"
+/* logging */
/* log to stdout */
#define LogMessage(dest, priority, layer, fmt, ...) \
do { \
@@ -2043,22 +2044,22 @@ extern const token_spec_t token_specific;
/* Debug logging */
#ifdef DEBUG
-#define LogDebug(fmt, ...) LogMessage(stdout, "LOG_DEBUG", APPID, fmt,
##__VA_ARGS__)
-#define LogDebug1(data) LogMessage1(stdout, "LOG_DEBUG", APPID, data)
+#define LogDebug(fmt, ...) LogMessage(stdout, "LOG_DEBUG", STDLL_NAME,
fmt, ##__VA_ARGS__)
+#define LogDebug1(data) LogMessage1(stdout, "LOG_DEBUG", STDLL_NAME,
data)
/* Error logging */
-#define LogError(fmt, ...) LogMessage(stderr, "LOG_ERR", APPID, "ERROR: "
fmt, ##__VA_ARGS__)
-#define LogError1(data) LogMessage1(stderr, "LOG_ERR", APPID, "ERROR:
" data)
+#define LogError(fmt, ...) LogMessage(stderr, "LOG_ERR", STDLL_NAME,
"ERROR: " fmt, ##__VA_ARGS__)
+#define LogError1(data) LogMessage1(stderr, "LOG_ERR", STDLL_NAME,
"ERROR: " data)
/* Warn logging */
-#define LogWarn(fmt, ...) LogMessage(stdout, "LOG_WARNING", APPID,
"WARNING: " fmt, ##__VA_ARGS__)
-#define LogWarn1(data) LogMessage1(stdout, "LOG_WARNING", APPID,
"WARNING: " data)
+#define LogWarn(fmt, ...) LogMessage(stdout, "LOG_WARNING", STDLL_NAME,
"WARNING: " fmt, ##__VA_ARGS__)
+#define LogWarn1(data) LogMessage1(stdout, "LOG_WARNING", STDLL_NAME,
"WARNING: " data)
/* Info Logging */
-#define LogInfo(fmt, ...) LogMessage(stdout, "LOG_INFO", APPID, fmt,
##__VA_ARGS__)
-#define LogInfo1(data) LogMessage1(stdout, "LOG_INFO", APPID, data)
+#define LogInfo(fmt, ...) LogMessage(stdout, "LOG_INFO", STDLL_NAME,
fmt, ##__VA_ARGS__)
+#define LogInfo1(data) LogMessage1(stdout, "LOG_INFO", STDLL_NAME,
data)
-#define st_err_log(...) LogMessage(stderr, "ST MSG", APPID,
"whammy")
+#define st_err_log(...) LogMessage(stderr, "ST MSG",
STDLL_NAME, "whammy")
void dump_shm(const char *);
#define DUMP_SHM(x) dump_shm(x)
--
1.7.5.rc1
------------------------------------------------------------------------------
Fulfilling the Lean Software Promise
Lean software platforms are now widely adopted and the benefits have been
demonstrated beyond question. Learn why your peers are replacing JEE
containers with lightweight application servers - and what you can gain
from the move. http://p.sf.net/sfu/vmware-sfemails
_______________________________________________
Opencryptoki-tech mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/opencryptoki-tech
