diff options
| author | lloyd <[email protected]> | 2010-01-27 01:48:42 +0000 |
|---|---|---|
| committer | lloyd <[email protected]> | 2010-01-27 01:48:42 +0000 |
| commit | 16c3b54220d6e80f713a4d6321deb53a7b1e1fec (patch) | |
| tree | cd452223c2b0c55ddc07d319e8d4a08bb61abd34 /src/cert | |
| parent | ff0f319cebdee80d500a9a3efaa5710df5c55bd9 (diff) | |
| parent | 9a75697edcf97b16c98cc03446553616e8ddcde1 (diff) | |
propagate from branch 'net.randombit.botan' (head af0e75a6f88cf5c3e0c53f949ae83242dedc5786)
to branch 'net.randombit.botan.c++0x' (head 5543a042e04c7ff88a110c7271918488b13342f1)
Diffstat (limited to 'src/cert')
| -rw-r--r-- | src/cert/cvc/cvc_self.cpp | 4 | ||||
| -rw-r--r-- | src/cert/cvc/eac_obj.h | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/cert/cvc/cvc_self.cpp b/src/cert/cvc/cvc_self.cpp index 0052651c9..dae8f1804 100644 --- a/src/cert/cvc/cvc_self.cpp +++ b/src/cert/cvc/cvc_self.cpp @@ -80,7 +80,7 @@ EAC1_1_CVC create_self_signed_cert(Private_Key const& key, ASN1_Chr chr(opt.car.value()); AlgorithmIdentifier sig_algo; - std::string padding_and_hash(eac_cvc_emsa + "(" + opt.hash_alg + ")"); + std::string padding_and_hash("EMSA1_BSI(" + opt.hash_alg + ")"); sig_algo.oid = OIDS::lookup(priv_key->algo_name() + "/" + padding_and_hash); sig_algo = AlgorithmIdentifier(sig_algo.oid, AlgorithmIdentifier::USE_NULL_PARAM); @@ -111,7 +111,7 @@ EAC1_1_Req create_cvc_req(Private_Key const& key, throw Invalid_Argument("CVC_EAC::create_self_signed_cert(): unsupported key type"); } AlgorithmIdentifier sig_algo; - std::string padding_and_hash(eac_cvc_emsa + "(" + hash_alg + ")"); + std::string padding_and_hash("EMSA1_BSI(" + hash_alg + ")"); sig_algo.oid = OIDS::lookup(priv_key->algo_name() + "/" + padding_and_hash); sig_algo = AlgorithmIdentifier(sig_algo.oid, AlgorithmIdentifier::USE_NULL_PARAM); diff --git a/src/cert/cvc/eac_obj.h b/src/cert/cvc/eac_obj.h index f822442bc..74d7460dd 100644 --- a/src/cert/cvc/eac_obj.h +++ b/src/cert/cvc/eac_obj.h @@ -23,8 +23,6 @@ namespace Botan { -const std::string eac_cvc_emsa("EMSA1_BSI"); - /* * TR03110 v1.1 EAC CV Certificate */ |