diff options
| author | lloyd <[email protected]> | 2012-05-25 22:52:00 +0000 |
|---|---|---|
| committer | lloyd <[email protected]> | 2012-05-25 22:52:00 +0000 |
| commit | 12090a7148d9ee73572cc1a7268fc489504a8173 (patch) | |
| tree | 51e50ce0852c56231e9e6dc13f168b10edd45d01 /src/pubkey/x509_key.h | |
| parent | 9594979caf775dc4062850044715b804d1fda60c (diff) | |
| parent | 65cc04445f8d40497f02a14bd8cb97081790e54b (diff) | |
propagate from branch 'net.randombit.botan.x509-path-validation' (head 63b5a20eab129ca13287fda33d2d02eec329708f)
to branch 'net.randombit.botan' (head 8b8150f09c55184f028f2929c4e7f7cd0d46d96e)
Diffstat (limited to 'src/pubkey/x509_key.h')
| -rw-r--r-- | src/pubkey/x509_key.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/pubkey/x509_key.h b/src/pubkey/x509_key.h index 13ad7e635..fde765715 100644 --- a/src/pubkey/x509_key.h +++ b/src/pubkey/x509_key.h @@ -30,7 +30,7 @@ namespace X509 { * @param key the public key to encode * @return BER encoding of this key */ -BOTAN_DLL MemoryVector<byte> BER_encode(const Public_Key& key); +BOTAN_DLL std::vector<byte> BER_encode(const Public_Key& key); /** * PEM encode a public key into a string. @@ -58,7 +58,7 @@ BOTAN_DLL Public_Key* load_key(const std::string& filename); * @param enc the memory region containing the DER or PEM encoded key * @return new public key object */ -BOTAN_DLL Public_Key* load_key(const MemoryRegion<byte>& enc); +BOTAN_DLL Public_Key* load_key(const secure_vector<byte>& enc); /** * Copy a key. |