diff options
| author | alee <alee@c9f7a03b-bd48-0410-a16d-cbbf54688b0b> | 2010-07-27 19:03:40 +0000 |
|---|---|---|
| committer | alee <alee@c9f7a03b-bd48-0410-a16d-cbbf54688b0b> | 2010-07-27 19:03:40 +0000 |
| commit | 2eb3243de06f1589991da47bfde6271e0d80abe6 (patch) | |
| tree | 8168ed24525ffd35989d54bd6dd81471d5df0b08 /pki/base/tps/src/include/processor/RA_Enroll_Processor.h | |
| parent | 9f8b12b0400f654f8b3f10ddbd731735c1d45607 (diff) | |
| download | pki-2eb3243de06f1589991da47bfde6271e0d80abe6.tar.gz pki-2eb3243de06f1589991da47bfde6271e0d80abe6.tar.xz pki-2eb3243de06f1589991da47bfde6271e0d80abe6.zip | |
merge 8.1 -> tip, multiple bugs (base)
git-svn-id: svn+ssh://svn.fedorahosted.org/svn/pki/trunk@1134 c9f7a03b-bd48-0410-a16d-cbbf54688b0b
Diffstat (limited to 'pki/base/tps/src/include/processor/RA_Enroll_Processor.h')
| -rw-r--r-- | pki/base/tps/src/include/processor/RA_Enroll_Processor.h | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/pki/base/tps/src/include/processor/RA_Enroll_Processor.h b/pki/base/tps/src/include/processor/RA_Enroll_Processor.h index b63136f1e..17c56302d 100644 --- a/pki/base/tps/src/include/processor/RA_Enroll_Processor.h +++ b/pki/base/tps/src/include/processor/RA_Enroll_Processor.h @@ -88,7 +88,8 @@ class RA_Enroll_Processor : public RA_Processor bool DoRenewal(const char *connid, const char *profileId, CERTCertificate *i_cert, - CERTCertificate **o_cert); + CERTCertificate **o_cert, + char *error_msg); bool GenerateCertificate(AuthParams *login, int keyTypeNum, @@ -268,7 +269,10 @@ class RA_Enroll_Processor : public RA_Processor BYTE &o_major_version, BYTE &o_minor_version, Buffer *a_aid, - RA_Status &o_status ); + const char *msn, + const char *userid, + RA_Status &o_status, + char **key_version ); bool CheckAndUpgradeSymKeys( RA_Session *session, @@ -276,6 +280,9 @@ class RA_Enroll_Processor : public RA_Processor char *cuid, const char *tokenType, char *msn, + const char* applet_version, + const char* userid, + const char* key_version, Buffer *a_cardmanagerAID, /* in */ Buffer *a_appletAID, /* in */ Secure_Channel *&channel, /* out */ @@ -283,6 +290,9 @@ class RA_Enroll_Processor : public RA_Processor ); TPS_PUBLIC RA_Status Process(RA_Session *session, NameValueSet *extensions); + + private: + int GetNextFreeCertIdNumber(PKCS11Obj *pkcs11objx); }; #endif /* RA_ENROLL_PROCESSOR_H */ |