merge of '2139fa117e35116a6d728cc58b050fd5fa20994f'

     and 'dd71537d67dd5adb9ab0859ba761ce2fd78c042b'

6 files changed, 20 insertions, 11 deletions

diff --git a/doc/download.rst b/doc/download.rst
index 63688519c..f7d23986c 100644
--- a/doc/download.rst
+++ b/doc/download.rst
@@ -34,9 +34,9 @@ Current Development Series (1.11)
 ----------------------------------------
 
 The latest version of the current development series, from branch
-``net.randombit.botan``, is :doc:`relnotes/1_11_3`:
-:tgz:`1.11.3` (:tgz_sig:`sig <1.11.3>`),
-:tbz:`1.11.3` (:tbz_sig:`sig <1.11.3>`)
+``net.randombit.botan``, is :doc:`relnotes/1_11_4`:
+:tgz:`1.11.4` (:tgz_sig:`sig <1.11.4>`),
+:tbz:`1.11.4` (:tbz_sig:`sig <1.11.4>`)
 
 To access the latest unreleased sources, see :doc:`vcs`. A script also
 creates regular snapshots of trunk, which are available `here
diff --git a/doc/relnotes/1_11_4.rst b/doc/relnotes/1_11_4.rst
index b33798a13..a635531a7 100644
--- a/doc/relnotes/1_11_4.rst
+++ b/doc/relnotes/1_11_4.rst
@@ -1,4 +1,4 @@
-Version 1.11.4, Not Yet Released
+Version 1.11.4, 2013-07-25
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 * CPU specific extensions are now always compiled if support for the
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