diff options
author | lloyd <[email protected]> | 2010-03-04 03:28:48 +0000 |
---|---|---|
committer | lloyd <[email protected]> | 2010-03-04 03:28:48 +0000 |
commit | de89566f633d5ed807ca57a59cc1071f79fdded3 (patch) | |
tree | 4a0109b931df0f28ec01c3ae40b3d3f69543bbd8 /src/pubkey/if_algo | |
parent | 76f39cc9fe4b2a3354db22f8beaf0c3788578b79 (diff) |
Remove X509_Decoder. Fix GOST-34.10 DER constructor (was default to normal ECC)
Diffstat (limited to 'src/pubkey/if_algo')
-rw-r--r-- | src/pubkey/if_algo/if_algo.cpp | 30 | ||||
-rw-r--r-- | src/pubkey/if_algo/if_algo.h | 2 |
2 files changed, 0 insertions, 32 deletions
diff --git a/src/pubkey/if_algo/if_algo.cpp b/src/pubkey/if_algo/if_algo.cpp index 8260d56e0..682870663 100644 --- a/src/pubkey/if_algo/if_algo.cpp +++ b/src/pubkey/if_algo/if_algo.cpp @@ -39,36 +39,6 @@ IF_Scheme_PublicKey::IF_Scheme_PublicKey(const AlgorithmIdentifier&, .end_cons(); } -/* -* Return the X.509 public key decoder -*/ -X509_Decoder* IF_Scheme_PublicKey::x509_decoder() - { - class IF_Scheme_Decoder : public X509_Decoder - { - public: - void alg_id(const AlgorithmIdentifier&) {} - - void key_bits(const MemoryRegion<byte>& bits) - { - BER_Decoder(bits) - .start_cons(SEQUENCE) - .decode(key->n) - .decode(key->e) - .verify_end() - .end_cons(); - - key->X509_load_hook(); - } - - IF_Scheme_Decoder(IF_Scheme_PublicKey* k) : key(k) {} - private: - IF_Scheme_PublicKey* key; - }; - - return new IF_Scheme_Decoder(this); - } - MemoryVector<byte> IF_Scheme_PrivateKey::pkcs8_private_key() const { return DER_Encoder() diff --git a/src/pubkey/if_algo/if_algo.h b/src/pubkey/if_algo/if_algo.h index fc09f2881..958735c4d 100644 --- a/src/pubkey/if_algo/if_algo.h +++ b/src/pubkey/if_algo/if_algo.h @@ -41,8 +41,6 @@ class BOTAN_DLL IF_Scheme_PublicKey : public virtual Public_Key u32bit max_input_bits() const { return (n.bits() - 1); } - X509_Decoder* x509_decoder(); - IF_Scheme_PublicKey(const AlgorithmIdentifier& alg_id, const MemoryRegion<byte>& key_bits); protected: |