merged OpenSSH 4.4p1 to trunk

[gssapi-openssh.git] / openssh / cipher-ctr.c

diff --git a/openssh/cipher-ctr.c b/openssh/cipher-ctr.c
index 8a98f3c42559148a188ba813fe525098826f9e3d..b24f3a4288662108d0aa67e99e0b4cc86df22d61 100644 (file)
--- a/openssh/cipher-ctr.c
+++ b/openssh/cipher-ctr.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: cipher-ctr.c,v 1.10 2006/08/03 03:34:42 deraadt Exp $ */
 /*
  * Copyright (c) 2003 Markus Friedl <markus@openbsd.org>
  *
@@ -14,12 +15,16 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 #include "includes.h"
-RCSID("$OpenBSD: cipher-ctr.c,v 1.6 2005/07/17 07:17:55 djm Exp $");
+
+#include <sys/types.h>
+
+#include <stdarg.h>
+#include <string.h>
 
 #include <openssl/evp.h>
 
-#include "log.h"
 #include "xmalloc.h"
+#include "log.h"
 
 /* compatibility with old or broken OpenSSL versions */
 #include "openbsd-compat/openssl-compat.h"