git-merge-changelog: add doc relating to use with bzr and hg.

[gnulib.git] / lib / hmac-sha1.c

diff --git a/lib/hmac-sha1.c b/lib/hmac-sha1.c
index f7a3fda..5d89d81 100644 (file)
--- a/lib/hmac-sha1.c
+++ b/lib/hmac-sha1.c
@@ -1,5 +1,5 @@
 /* hmac-sha1.c -- hashed message authentication codes
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006, 2009, 2010 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -17,9 +17,7 @@
 
 /* Written by Simon Josefsson.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "hmac.h"
 
@@ -33,7 +31,7 @@
 
 int
 hmac_sha1 (const void *key, size_t keylen,
-          const void *in, size_t inlen, void *resbuf)
+           const void *in, size_t inlen, void *resbuf)
 {
   struct sha1_ctx inner;
   struct sha1_ctx outer;