diff options
author | Damien Miller <djm@mindrot.org> | 2006-08-05 12:39:39 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2006-08-05 12:39:39 +1000 |
commit | d783435315d8e604998925d5e47b663a500ed252 (patch) | |
tree | 510a72c4fa0a6cbb51c24bad2bc6d6e7f329db94 /cipher-ctr.c | |
parent | 4dec5d75daab22c31f6f67d9e83594076ae3eda7 (diff) |
- deraadt@cvs.openbsd.org 2006/08/03 03:34:42
[OVERVIEW atomicio.c atomicio.h auth-bsdauth.c auth-chall.c auth-krb5.c]
[auth-options.c auth-options.h auth-passwd.c auth-rh-rsa.c auth-rhosts.c]
[auth-rsa.c auth-skey.c auth.c auth.h auth1.c auth2-chall.c auth2-gss.c]
[auth2-hostbased.c auth2-kbdint.c auth2-none.c auth2-passwd.c ]
[auth2-pubkey.c auth2.c authfd.c authfd.h authfile.c bufaux.c bufbn.c]
[buffer.c buffer.h canohost.c channels.c channels.h cipher-3des1.c]
[cipher-bf1.c cipher-ctr.c cipher.c cleanup.c clientloop.c compat.c]
[compress.c deattack.c dh.c dispatch.c dns.c dns.h fatal.c groupaccess.c]
[groupaccess.h gss-genr.c gss-serv-krb5.c gss-serv.c hostfile.c kex.c]
[kex.h kexdh.c kexdhc.c kexdhs.c kexgex.c kexgexc.c kexgexs.c key.c]
[key.h log.c log.h mac.c match.c md-sha256.c misc.c misc.h moduli.c]
[monitor.c monitor_fdpass.c monitor_mm.c monitor_mm.h monitor_wrap.c]
[monitor_wrap.h msg.c nchan.c packet.c progressmeter.c readconf.c]
[readconf.h readpass.c rsa.c scard.c scard.h scp.c servconf.c servconf.h]
[serverloop.c session.c session.h sftp-client.c sftp-common.c]
[sftp-common.h sftp-glob.c sftp-server.c sftp.c ssh-add.c ssh-agent.c]
[ssh-dss.c ssh-gss.h ssh-keygen.c ssh-keyscan.c ssh-keysign.c ssh-rsa.c]
[ssh.c ssh.h sshconnect.c sshconnect.h sshconnect1.c sshconnect2.c]
[sshd.c sshlogin.c sshlogin.h sshpty.c sshpty.h sshtty.c ttymodes.c]
[uidswap.c uidswap.h uuencode.c uuencode.h xmalloc.c xmalloc.h]
[loginrec.c loginrec.h openbsd-compat/port-aix.c openbsd-compat/port-tun.h]
almost entirely get rid of the culture of ".h files that include .h files"
ok djm, sort of ok stevesk
makes the pain stop in one easy step
NB. portable commit contains everything *except* removing includes.h, as
that will take a fair bit more work as we move headers that are required
for portability workarounds to defines.h. (also, this step wasn't "easy")
Diffstat (limited to 'cipher-ctr.c')
-rw-r--r-- | cipher-ctr.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/cipher-ctr.c b/cipher-ctr.c index 105d0bd5b..9733b7d56 100644 --- a/cipher-ctr.c +++ b/cipher-ctr.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: cipher-ctr.c,v 1.9 2006/07/22 20:48:22 stevesk Exp $ */ | 1 | /* $OpenBSD: cipher-ctr.c,v 1.10 2006/08/03 03:34:42 deraadt Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2003 Markus Friedl <markus@openbsd.org> | 3 | * Copyright (c) 2003 Markus Friedl <markus@openbsd.org> |
4 | * | 4 | * |
@@ -16,12 +16,14 @@ | |||
16 | */ | 16 | */ |
17 | #include "includes.h" | 17 | #include "includes.h" |
18 | 18 | ||
19 | #include <sys/types.h> | ||
20 | |||
19 | #include <string.h> | 21 | #include <string.h> |
20 | 22 | ||
21 | #include <openssl/evp.h> | 23 | #include <openssl/evp.h> |
22 | 24 | ||
23 | #include "log.h" | ||
24 | #include "xmalloc.h" | 25 | #include "xmalloc.h" |
26 | #include "log.h" | ||
25 | 27 | ||
26 | /* compatibility with old or broken OpenSSL versions */ | 28 | /* compatibility with old or broken OpenSSL versions */ |
27 | #include "openbsd-compat/openssl-compat.h" | 29 | #include "openbsd-compat/openssl-compat.h" |