diff options
| author | lloyd <[email protected]> | 2010-02-23 17:16:09 +0000 |
|---|---|---|
| committer | lloyd <[email protected]> | 2010-02-23 17:16:09 +0000 |
| commit | 9b3213732ac828e8cf00da95aa3d85fca700372f (patch) | |
| tree | 7311dbd3ae051015fa04ebff4b8fe8d44eb898e8 /src/pubkey | |
| parent | b9e801f1d11ad5367e6ac1b4224cfb6045e30123 (diff) | |
Remove unused variable in ec_dompar. Add missing include to ecc_key
Diffstat (limited to 'src/pubkey')
| -rw-r--r-- | src/pubkey/ec_dompar/ec_dompar.cpp | 8 | ||||
| -rw-r--r-- | src/pubkey/ecc_key/ecc_key.h | 1 |
2 files changed, 4 insertions, 5 deletions
diff --git a/src/pubkey/ec_dompar/ec_dompar.cpp b/src/pubkey/ec_dompar/ec_dompar.cpp index 0b5a6e681..475a1ce52 100644 --- a/src/pubkey/ec_dompar/ec_dompar.cpp +++ b/src/pubkey/ec_dompar/ec_dompar.cpp @@ -552,18 +552,16 @@ EC_Domain_Params decode_ber_ec_dompar(SecureVector<byte> const& encoded) { BER_Decoder dec(encoded); BER_Object obj = dec.get_next_object(); - ASN1_Tag tag = obj.type_tag; - std::auto_ptr<EC_Domain_Params> p_result; - if(tag == OBJECT_ID) + if(obj.type_tag == OBJECT_ID) { OID dom_par_oid; BER_Decoder(encoded).decode(dom_par_oid); return EC_Domain_Params(get_ec_dompar(dom_par_oid.as_string())); } - else if(tag == SEQUENCE) + else if(obj.type_tag == SEQUENCE) return EC_Domain_Params(decode_ber_ec_dompar_explicit(encoded)); - else if(tag == NULL_TAG) + else if(obj.type_tag == NULL_TAG) throw Decoding_Error("cannot decode ECDSA parameters that are ImplicitCA"); throw Decoding_Error("encountered unexpected when trying to decode domain parameters"); diff --git a/src/pubkey/ecc_key/ecc_key.h b/src/pubkey/ecc_key/ecc_key.h index 0ca9a0e75..c1a227bf2 100644 --- a/src/pubkey/ecc_key/ecc_key.h +++ b/src/pubkey/ecc_key/ecc_key.h @@ -16,6 +16,7 @@ #include <botan/ec_dompar.h> #include <botan/x509_key.h> #include <botan/pkcs8.h> +#include <memory> namespace Botan { |