diff options
| author | lloyd <[email protected]> | 2013-07-30 14:30:02 +0000 |
|---|---|---|
| committer | lloyd <[email protected]> | 2013-07-30 14:30:02 +0000 |
| commit | d7a78ab446b98aaa90d7250b196d5270ef2d4286 (patch) | |
| tree | 859acf0766f6da1be18df0c596da98f4a174d13a | |
| parent | 5124d19fb1cbecf3aa098d557702ca2673e06607 (diff) | |
| parent | 72672194fda9ddf40fae63e7f19ccf39d72185f4 (diff) | |
merge of '5f4aa843bb54591e6bcdf6db6efecf1cb5937638'
and 'bf98faaf2da19ead6fe6c795e488a7fae04804d2'
| -rw-r--r-- | src/aead/eax/eax.h | 4 | ||||
| -rw-r--r-- | src/aead/gcm/gcm.h | 4 | ||||
| -rw-r--r-- | src/aead/ocb/ocb.h | 4 | ||||
| -rw-r--r-- | src/tls/tls_channel.h | 11 |
4 files changed, 16 insertions, 7 deletions
diff --git a/src/aead/eax/eax.h b/src/aead/eax/eax.h index f93e48d22..6815e3ce0 100644 --- a/src/aead/eax/eax.h +++ b/src/aead/eax/eax.h @@ -5,8 +5,8 @@ * Distributed under the terms of the Botan license */ -#ifndef BOTAN_EAX_H__ -#define BOTAN_EAX_H__ +#ifndef BOTAN_AEAD_EAX_H__ +#define BOTAN_AEAD_EAX_H__ #include <botan/aead.h> #include <botan/block_cipher.h> diff --git a/src/aead/gcm/gcm.h b/src/aead/gcm/gcm.h index f36aafc5f..e1479c27f 100644 --- a/src/aead/gcm/gcm.h +++ b/src/aead/gcm/gcm.h @@ -5,8 +5,8 @@ * Distributed under the terms of the Botan license */ -#ifndef BOTAN_GCM_H__ -#define BOTAN_GCM_H__ +#ifndef BOTAN_AEAD_GCM_H__ +#define BOTAN_AEAD_GCM_H__ #include <botan/aead.h> #include <botan/block_cipher.h> diff --git a/src/aead/ocb/ocb.h b/src/aead/ocb/ocb.h index c4d3c9588..ea7729348 100644 --- a/src/aead/ocb/ocb.h +++ b/src/aead/ocb/ocb.h @@ -5,8 +5,8 @@ * Distributed under the terms of the Botan license */ -#ifndef BOTAN_OCB_H__ -#define BOTAN_OCB_H__ +#ifndef BOTAN_AEAD_OCB_H__ +#define BOTAN_AEAD_OCB_H__ #include <botan/aead.h> #include <botan/block_cipher.h> diff --git a/src/tls/tls_channel.h b/src/tls/tls_channel.h index 2dd810c84..32609a14c 100644 --- a/src/tls/tls_channel.h +++ b/src/tls/tls_channel.h @@ -47,7 +47,16 @@ class BOTAN_DLL Channel /** * Inject plaintext intended for counterparty */ - void send(const std::string& string); + void send(const std::string& val); + + /** + * Inject plaintext intended for counterparty + */ + template<typename Alloc> + void send(const std::vector<unsigned char, Alloc>& val) + { + send(&val[0], val.size()); + } /** * Send a TLS alert message. If the alert is fatal, the internal |