diff options
| author | jmagne <jmagne@c9f7a03b-bd48-0410-a16d-cbbf54688b0b> | 2011-02-10 23:24:38 +0000 |
|---|---|---|
| committer | jmagne <jmagne@c9f7a03b-bd48-0410-a16d-cbbf54688b0b> | 2011-02-10 23:24:38 +0000 |
| commit | a4d6d9a681e4a63e3346711a6b55831602c1e19e (patch) | |
| tree | 85d56884ad0e36cd16e74c14c54c74ead0a1ec62 /pki/base/tps/src/processor/RA_Enroll_Processor.cpp | |
| parent | c6f9dc12859c310606037a979cfcaa11b801ffd8 (diff) | |
| download | pki-a4d6d9a681e4a63e3346711a6b55831602c1e19e.tar.gz pki-a4d6d9a681e4a63e3346711a6b55831602c1e19e.tar.xz pki-a4d6d9a681e4a63e3346711a6b55831602c1e19e.zip | |
Bugzilla Bug 676678 - Missing audit log messages for Secure Channel Generation.
git-svn-id: svn+ssh://svn.fedorahosted.org/svn/pki/trunk@1841 c9f7a03b-bd48-0410-a16d-cbbf54688b0b
Diffstat (limited to 'pki/base/tps/src/processor/RA_Enroll_Processor.cpp')
| -rw-r--r-- | pki/base/tps/src/processor/RA_Enroll_Processor.cpp | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/pki/base/tps/src/processor/RA_Enroll_Processor.cpp b/pki/base/tps/src/processor/RA_Enroll_Processor.cpp index c7c64c663..f0bbe3ea2 100644 --- a/pki/base/tps/src/processor/RA_Enroll_Processor.cpp +++ b/pki/base/tps/src/processor/RA_Enroll_Processor.cpp @@ -1187,6 +1187,7 @@ bool RA_Enroll_Processor::CheckAndUpgradeApplet( RA_Status &o_status, char **keyVersion ) { + int rc = 0; const char *FN = "RA_Enroll_Processor::CheckAndUpgradeApplet"; bool r = true; const char *applet_dir=NULL; @@ -1230,7 +1231,7 @@ bool RA_Enroll_Processor::CheckAndUpgradeApplet( RA::Debug(FN, "TKS connection id =%s", connid); //StatusUpdate(a_session, a_extensions, 5, "PROGRESS_UPGRADE_APPLET"); - if (UpgradeApplet(a_session, (char *) OP_PREFIX, (char*) a_tokenType, + if (rc = UpgradeApplet(a_session, (char *) OP_PREFIX, (char*) a_tokenType, o_major_version, o_minor_version, g_applet_target_version, applet_dir, security_level, @@ -1248,6 +1249,18 @@ bool RA_Enroll_Processor::CheckAndUpgradeApplet( o_status = STATUS_ERROR_UPGRADE_APPLET; r = false; + if (rc == -1) { + RA::Audit(EV_APPLET_UPGRADE, AUDIT_MSG_APPLET_UPGRADE, + a_userid, a_cuid, a_msn, "Failure", "enrollment", + *keyVersion != NULL? *keyVersion : "", o_current_applet_on_token, g_applet_target_version, "failed to setup secure channel"); + } else { + + RA::Audit(EV_APPLET_UPGRADE, AUDIT_MSG_APPLET_UPGRADE, + a_userid, a_cuid, a_msn, "Success", "enrollment", + *keyVersion != NULL? *keyVersion : "", o_current_applet_on_token, g_applet_target_version, "setup secure channel"); + } + + RA::Audit(EV_APPLET_UPGRADE, AUDIT_MSG_APPLET_UPGRADE, a_userid, a_cuid, a_msn, "Failure", "enrollment", *keyVersion != NULL? *keyVersion : "", @@ -1261,7 +1274,11 @@ bool RA_Enroll_Processor::CheckAndUpgradeApplet( } // Upgrade Applet reported success - + + RA::Audit(EV_APPLET_UPGRADE, AUDIT_MSG_APPLET_UPGRADE, + a_userid, a_cuid, a_msn, "Success", "enrollment", + *keyVersion != NULL? *keyVersion : "", o_current_applet_on_token, g_applet_target_version, "setup secure channel"); + RA::Audit(EV_APPLET_UPGRADE, AUDIT_MSG_APPLET_UPGRADE, a_userid, a_cuid, a_msn, "Success", "enrollment", *keyVersion != NULL? *keyVersion : "", |