Signed-off-by: Andreas Piesk <[email protected]>
---
usr/lib/pkcs11/common/utility.c | 4 +++-
usr/lib/pkcs11/tpm_stdll/tpm_openssl.c | 4 ----
usr/lib/pkcs11/tpm_stdll/tpm_specific.c | 4 ----
usr/lib/pkcs11/tpm_stdll/tpm_util.c | 4 ----
usr/sbin/pkcsconf/pkcsconf.c | 12 ++++++------
5 files changed, 9 insertions(+), 19 deletions(-)
diff --git a/usr/lib/pkcs11/common/utility.c b/usr/lib/pkcs11/common/utility.c
index 25ab1fd..fc772c6 100755
--- a/usr/lib/pkcs11/common/utility.c
+++ b/usr/lib/pkcs11/common/utility.c
@@ -971,8 +971,10 @@ init_token_data( void )
return CKR_FUNCTION_FAILED;
}
rc = save_token_data();
- if (rc != CKR_OK)
+ if (rc != CKR_OK) {
// st_err_log(4, __FILE__, __LINE__, __FUNCTION__);
+ }
+
return rc;
}
diff --git a/usr/lib/pkcs11/tpm_stdll/tpm_openssl.c
b/usr/lib/pkcs11/tpm_stdll/tpm_openssl.c
index 209ed45..33efde5 100644
--- a/usr/lib/pkcs11/tpm_stdll/tpm_openssl.c
+++ b/usr/lib/pkcs11/tpm_stdll/tpm_openssl.c
@@ -33,10 +33,6 @@
#include <openssl/rand.h>
#include <tss/platform.h>
-#include <tss/tcpa_defines.h>
-#include <tss/tcpa_typedef.h>
-#include <tss/tcpa_struct.h>
-#include <tss/tcpa_error.h>
#include <tss/tss_defines.h>
#include <tss/tss_typedef.h>
#include <tss/tss_structs.h>
diff --git a/usr/lib/pkcs11/tpm_stdll/tpm_specific.c
b/usr/lib/pkcs11/tpm_stdll/tpm_specific.c
index d5708c3..cd75ead 100644
--- a/usr/lib/pkcs11/tpm_stdll/tpm_specific.c
+++ b/usr/lib/pkcs11/tpm_stdll/tpm_specific.c
@@ -53,10 +53,6 @@
#include <openssl/evp.h>
#include <tss/platform.h>
-#include <tss/tcpa_defines.h>
-#include <tss/tcpa_typedef.h>
-#include <tss/tcpa_struct.h>
-#include <tss/tcpa_error.h>
#include <tss/tss_defines.h>
#include <tss/tss_typedef.h>
#include <tss/tss_structs.h>
diff --git a/usr/lib/pkcs11/tpm_stdll/tpm_util.c
b/usr/lib/pkcs11/tpm_stdll/tpm_util.c
index 443c12b..8aa9f16 100644
--- a/usr/lib/pkcs11/tpm_stdll/tpm_util.c
+++ b/usr/lib/pkcs11/tpm_stdll/tpm_util.c
@@ -30,10 +30,6 @@
#include <openssl/rsa.h>
#include <tss/platform.h>
-#include <tss/tcpa_defines.h>
-#include <tss/tcpa_typedef.h>
-#include <tss/tcpa_struct.h>
-#include <tss/tcpa_error.h>
#include <tss/tss_defines.h>
#include <tss/tss_typedef.h>
#include <tss/tss_structs.h>
diff --git a/usr/sbin/pkcsconf/pkcsconf.c b/usr/sbin/pkcsconf/pkcsconf.c
index 99158d8..121f268 100755
--- a/usr/sbin/pkcsconf/pkcsconf.c
+++ b/usr/sbin/pkcsconf/pkcsconf.c
@@ -559,14 +559,14 @@ main(int argc, char *argv[]){
fflush(stdout);
rc = get_pin(&newpin);
} while (rc == -EINVAL);
- newpinlen = strlen(newpin);
+ newpinlen = strlen((char *)newpin);
do {
printf(PKCSINIT_MSG(VNEWUSER,
"Re-enter the new user PIN: "));
fflush(stdout);
rc = get_pin(&newpin2);
} while (rc == -EINVAL);
- newpin2len = strlen(newpin2);
+ newpin2len = strlen((char *)newpin2);
if (newpinlen != newpin2len || memcmp(newpin, newpin2,
strlen((char *)newpin)) != 0) {
printf(PKCSINIT_MSG(PINMISMATCH, "New PINs do not
match.\n"));
fflush(stdout);
@@ -603,13 +603,13 @@ main(int argc, char *argv[]){
fflush(stdout);
rc = get_pin(&newpin);
} while (rc == -EINVAL);
- newpinlen = strlen(newpin);
+ newpinlen = strlen((char *)newpin);
do {
printf(PKCSINIT_MSG(VNEWSO, "Re-enter the new SO PIN: "));
fflush(stdout);
rc = get_pin(&newpin2);
} while (rc == -EINVAL);
- newpin2len = strlen(newpin2);
+ newpin2len = strlen((char *)newpin2);
if (newpinlen != newpin2len || memcmp(newpin, newpin2,
strlen((char *)newpin)) != 0) {
printf(PKCSINIT_MSG(PINMISMATCH, "New PINs do not
match.\n"));
fflush(stdout);
@@ -644,13 +644,13 @@ main(int argc, char *argv[]){
fflush(stdout);
rc = get_pin(&newpin);
} while (rc == -EINVAL);
- newpinlen = strlen(newpin);
+ newpinlen = strlen((char *)newpin);
do {
printf(PKCSINIT_MSG(VNEWUSER, "Re-enter the new user PIN:
"));
fflush(stdout);
rc = get_pin(&newpin2);
} while (rc == -EINVAL);
- newpin2len = strlen(newpin2);
+ newpin2len = strlen((char *)newpin2);
if (newpinlen != newpin2len || memcmp(newpin, newpin2,
strlen((char *)newpin)) != 0) {
printf(PKCSINIT_MSG(PINMISMATCH, "New PINs do not
match.\n"));
fflush(stdout);
--
1.7.1
------------------------------------------------------------------------------
Special Offer-- Download ArcSight Logger for FREE (a $49 USD value)!
Finally, a world-class log management solution at an even better price-free!
Download using promo code Free_Logger_4_Dev2Dev. Offer expires
February 28th, so secure your free ArcSight Logger TODAY!
http://p.sf.net/sfu/arcsight-sfd2d
_______________________________________________
Opencryptoki-tech mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/opencryptoki-tech
