From 1d47fb26f9b93898e9dcd70519c8a4167af3d5d3 Mon Sep 17 00:00:00 2001
From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Sat, 11 Apr 2009 16:59:46 +0200
Subject: [PATCH] =?utf8?q?network=20plugin:=20Talk=20about=20=E2=80=9CHMAC?=
 =?utf8?q?-SHA-256=E2=80=9D=20in=20the=20documentation=20and=20error=20mes?=
 =?utf8?q?sages.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 src/collectd.conf.pod | 10 ++++++----
 src/network.c         |  6 +++---
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/collectd.conf.pod b/src/collectd.conf.pod
index 581da285..b335488c 100644
--- a/src/collectd.conf.pod
+++ b/src/collectd.conf.pod
@@ -1596,10 +1596,12 @@ B<E<lt>ListenE<gt>> blocks:
 
 Set the security you require for network communication. When the security level
 has been set to B<Encrypt>, data sent over the network will be encrypted using
-I<AES-256> and only encrypted data will be accepted when receiving. When set to
-B<Sign>, transmitted data is signed using I<SHA-256> and only signed and
-encrypted data is accepted when receiving. When set to B<None>, data is sent
-without any security and all data is accepted when receiving.
+I<AES-256> and only encrypted data will be accepted when receiving. The
+integrity of encrypted packets is ensures using I<SHA-1>. When set to B<Sign>,
+transmitted data is signed using the I<HMAC-SHA-256> message authentication
+code and only signed and encrypted data is accepted when receiving. When set to
+B<None>, data is sent without any security and all data is accepted when
+receiving.
 
 This feature is only available if the I<network> plugin was linked with
 I<libgcrypt>.
diff --git a/src/network.c b/src/network.c
index 920b8913..ca63e965 100644
--- a/src/network.c
+++ b/src/network.c
@@ -761,7 +761,7 @@ static int parse_part_sign_sha256 (sockent_t *se, /* {{{ */
   err = gcry_md_open (&hd, GCRY_MD_SHA256, GCRY_MD_FLAG_HMAC);
   if (err != 0)
   {
-    ERROR ("network plugin: Creating HMAC object failed: %s",
+    ERROR ("network plugin: Creating HMAC-SHA-256 object failed: %s",
         gcry_strerror (err));
     return (-1);
   }
@@ -1030,7 +1030,7 @@ static int parse_packet (receive_list_entry_t *rle) /* {{{ */
 			status = parse_part_sign_sha256 (se, &buffer, &buffer_len);
 			if (status < 0)
 			{
-				ERROR ("network plugin: Verifying SHA-256 "
+				ERROR ("network plugin: Verifying HMAC-SHA-256 "
 						"signature failed "
 						"with status %i.", status);
 				break;
@@ -1038,7 +1038,7 @@ static int parse_packet (receive_list_entry_t *rle) /* {{{ */
 			else if (status > 0)
 			{
 				ERROR ("network plugin: Ignoring packet with "
-						"invalid SHA-256 signature.");
+						"invalid HMAC-SHA-256 signature.");
 				break;
 			}
 			else
-- 
2.11.0