diff options
author | Colin Watson <cjwatson@debian.org> | 2009-12-29 21:38:40 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2009-12-29 21:38:40 +0000 |
commit | 1b816ea846aca3ee89e7995373ace609e9518424 (patch) | |
tree | b41cdc8495cae7fa9c2e0f98a5f2e71656b61f9a /cipher-ctr.c | |
parent | fa585019a79ebcb4e0202b1c33f87ff1c5c9ce1c (diff) | |
parent | 086ea76990b1e6287c24b6db74adffd4605eb3b0 (diff) |
import openssh-4.6p1-gsskex-20070312.patch
Diffstat (limited to 'cipher-ctr.c')
-rw-r--r-- | cipher-ctr.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/cipher-ctr.c b/cipher-ctr.c index 8a98f3c42..b24f3a428 100644 --- a/cipher-ctr.c +++ b/cipher-ctr.c | |||
@@ -1,3 +1,4 @@ | |||
1 | /* $OpenBSD: cipher-ctr.c,v 1.10 2006/08/03 03:34:42 deraadt Exp $ */ | ||
1 | /* | 2 | /* |
2 | * Copyright (c) 2003 Markus Friedl <markus@openbsd.org> | 3 | * Copyright (c) 2003 Markus Friedl <markus@openbsd.org> |
3 | * | 4 | * |
@@ -14,12 +15,16 @@ | |||
14 | * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. | 15 | * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. |
15 | */ | 16 | */ |
16 | #include "includes.h" | 17 | #include "includes.h" |
17 | RCSID("$OpenBSD: cipher-ctr.c,v 1.6 2005/07/17 07:17:55 djm Exp $"); | 18 | |
19 | #include <sys/types.h> | ||
20 | |||
21 | #include <stdarg.h> | ||
22 | #include <string.h> | ||
18 | 23 | ||
19 | #include <openssl/evp.h> | 24 | #include <openssl/evp.h> |
20 | 25 | ||
21 | #include "log.h" | ||
22 | #include "xmalloc.h" | 26 | #include "xmalloc.h" |
27 | #include "log.h" | ||
23 | 28 | ||
24 | /* compatibility with old or broken OpenSSL versions */ | 29 | /* compatibility with old or broken OpenSSL versions */ |
25 | #include "openbsd-compat/openssl-compat.h" | 30 | #include "openbsd-compat/openssl-compat.h" |