aboutsummaryrefslogtreecommitdiffstats
path: root/src/cert
diff options
context:
space:
mode:
authorlloyd <lloyd@randombit.net>2010-03-02 05:08:15 +0000
committerlloyd <lloyd@randombit.net>2010-03-02 05:08:15 +0000
commit3c15bd259f0921f1fa08ec91ee3cf2621c64a02d (patch)
tree54351d5e865a872896c6a95175693cc0ffa9e246 /src/cert
parent5fec937bd0c72858d6cf2f09b58b219294c7d5cc (diff)
parent54a3c5ae67f8b987d05ffd18e2d49a2da1d5988e (diff)
propagate from branch 'net.randombit.botan' (head fc86fc4842254088bf820ea6ebf05877aa63fb22)
to branch 'net.randombit.botan.c++0x' (head 77565ff7252df7f8faad86d65075498b0adb93d8)
Diffstat (limited to 'src/cert')
-rw-r--r--src/cert/cvc/cvc_self.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/cert/cvc/cvc_self.cpp b/src/cert/cvc/cvc_self.cpp
index 5ec7d7d32..1d06acd66 100644
--- a/src/cert/cvc/cvc_self.cpp
+++ b/src/cert/cvc/cvc_self.cpp
@@ -221,7 +221,7 @@ EAC1_1_CVC link_cvca(EAC1_1_CVC const& signer,
std::unique_ptr<Botan::PK_Signer> pk_signer(get_pk_signer(*priv_key, padding_and_hash));
std::unique_ptr<Public_Key> pk = signee.subject_public_key();
ECDSA_PublicKey* subj_pk = dynamic_cast<ECDSA_PublicKey*>(pk.get());
- subj_pk->set_parameter_encoding(ENC_EXPLICIT);
+ subj_pk->set_parameter_encoding(EC_DOMPAR_ENC_EXPLICIT);
#if 0 // FIXME
std::unique_ptr<EAC1_1_CVC_Encoder> enc(subj_pk->cvc_eac1_1_encoder());
@@ -265,9 +265,9 @@ EAC1_1_CVC sign_request(EAC1_1_CVC const& signer_cert,
// for the case that the domain parameters are not set...
// (we use those from the signer because they must fit)
- subj_pk->set_domain_parameters(priv_key->domain_parameters());
+ //subj_pk->set_domain_parameters(priv_key->domain_parameters());
- subj_pk->set_parameter_encoding(ENC_IMPLICITCA);
+ subj_pk->set_parameter_encoding(EC_DOMPAR_ENC_IMPLICITCA);
#if 0 // FIXME
std::unique_ptr<EAC1_1_CVC_Encoder> enc(subj_pk->cvc_eac1_1_encoder());
@@ -327,7 +327,7 @@ EAC1_1_Req create_cvc_req(Private_Key const& prkey,
throw Invalid_Argument("CVC_EAC::create_self_signed_cert(): unsupported key type");
}
ECDSA_PrivateKey key(*priv_key);
- key.set_parameter_encoding(ENC_IMPLICITCA);
+ key.set_parameter_encoding(EC_DOMPAR_ENC_IMPLICITCA);
return Botan::CVC_EAC::create_cvc_req(key, chr, hash_alg, rng);
}