upstream commit

remove unneeded includes, sync my copyright across files
 & whitespace; ok djm@

1 files changed, 1 insertions, 2 deletions

diff --git a/cipher-chachapoly.c b/cipher-chachapoly.c
index 8665b41a3..7f31ff4ce 100644
--- a/cipher-chachapoly.c
+++ b/cipher-chachapoly.c
@@ -14,7 +14,7 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $OpenBSD: cipher-chachapoly.c,v 1.6 2014/07/03 12:42:16 jsing Exp $ */
+/* $OpenBSD: cipher-chachapoly.c,v 1.7 2015/01/14 10:24:42 markus Exp $ */
 
 #include "includes.h"
 
@@ -116,4 +116,3 @@ chachapoly_get_length(struct chachapoly_ctx *ctx,
         *plenp = PEEK_U32(buf);
         return 0;
 }
-