diff options
| author | cfu <cfu@c9f7a03b-bd48-0410-a16d-cbbf54688b0b> | 2008-12-05 17:39:31 +0000 |
|---|---|---|
| committer | cfu <cfu@c9f7a03b-bd48-0410-a16d-cbbf54688b0b> | 2008-12-05 17:39:31 +0000 |
| commit | 0d821e2d8c62daf9a4cf44e1e0b66e50909338ac (patch) | |
| tree | 89571fbd5766fa525d99936823b1d97711a75984 /pki/base/tps/src/processor/RA_Enroll_Processor.cpp | |
| parent | 2336970eca34115aa66c990a35f41d8ba879ce76 (diff) | |
| download | pki-0d821e2d8c62daf9a4cf44e1e0b66e50909338ac.tar.gz pki-0d821e2d8c62daf9a4cf44e1e0b66e50909338ac.tar.xz pki-0d821e2d8c62daf9a4cf44e1e0b66e50909338ac.zip | |
Buzilla Bug 474659 - moved public key challenge generation from TPS to TKS
git-svn-id: svn+ssh://svn.fedorahosted.org/svn/pki/trunk@163 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 | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/pki/base/tps/src/processor/RA_Enroll_Processor.cpp b/pki/base/tps/src/processor/RA_Enroll_Processor.cpp index b8a5580d0..f44e77132 100644 --- a/pki/base/tps/src/processor/RA_Enroll_Processor.cpp +++ b/pki/base/tps/src/processor/RA_Enroll_Processor.cpp @@ -1598,7 +1598,7 @@ TPS_PUBLIC RA_Status RA_Enroll_Processor::Process(RA_Session *session, NameValue #define WRAPPED_CHALLENGE_SIZE 16 Buffer *plaintext_challenge = new Buffer(PLAINTEXT_CHALLENGE_SIZE, (BYTE)0); - Buffer *wrapped_challenge = new Buffer(PLAINTEXT_CHALLENGE_SIZE, (BYTE)0); + Buffer *wrapped_challenge = new Buffer(WRAPPED_CHALLENGE_SIZE, (BYTE)0); Buffer *key_check = new Buffer(0, (BYTE)0); const char *tokenType = NULL; @@ -1872,6 +1872,8 @@ TPS_PUBLIC RA_Status RA_Enroll_Processor::Process(RA_Session *session, NameValue /* generate challenge for enrollment */ RA::Debug(LL_PER_PDU, "RA_Enroll_Processor::Process", "Generate Challenge"); +/* + random number generation moved to TKS rc = Util::GetRandomChallenge(*plaintext_challenge); if (rc == -1) { RA::Error("RA_Enroll_Processor::Process", @@ -1880,8 +1882,9 @@ TPS_PUBLIC RA_Status RA_Enroll_Processor::Process(RA_Session *session, NameValue RA::tdb_activity(session->GetRemoteIP(), cuid, "enrollment", "failure", "general challenge error", ""); goto loser; } - } +*/ + } kdd = channel->GetKeyDiversificationData(); khex = kdd.toHex(); RA::Debug("RA_Enroll_Processor::Process", "cuid=%s", khex); @@ -1898,7 +1901,6 @@ TPS_PUBLIC RA_Status RA_Enroll_Processor::Process(RA_Session *session, NameValue RA::tdb_activity(session->GetRemoteIP(), cuid, "enrollment", "failure", "challenge encryption error", ""); goto loser; } - // read objects back PR_snprintf((char *)configname, 256, "%s.%s.pkcs11obj.enable", OP_PREFIX, tokenType); @@ -2049,7 +2051,7 @@ TPS_PUBLIC RA_Status RA_Enroll_Processor::Process(RA_Session *session, NameValue /* op.enroll.certificates.num=1 op.enroll.certificates.value.0=caCert -op.enroll.certificates.caCert.nickName=caCert0 pki-tps +op.enroll.certificates.caCert.nickName=caCert0 fpki-tps op.enroll.certificates.caCert.certId=C5 op.enroll.certificates.caCert.certAttrId=c5 op.enroll.certificates.caCert.label=caCert Label |