diff options
| author | Dag-Erling Smørgrav <des@FreeBSD.org> | 2006-09-30 13:38:06 +0000 |
|---|---|---|
| committer | Dag-Erling Smørgrav <des@FreeBSD.org> | 2006-09-30 13:38:06 +0000 |
| commit | 333ee03933b2892718b59734cd7dd3608b6caf1a (patch) | |
| tree | e8ca9ffe5bcb164be41a74f30a765b86bb38c885 /crypto/openssh/cipher.c | |
| parent | a4f3c15342ecc9af9988070f5350a7d52b3e3148 (diff) | |
| download | src-333ee03933b2892718b59734cd7dd3608b6caf1a.tar.gz src-333ee03933b2892718b59734cd7dd3608b6caf1a.zip | |
Merge conflicts.
MFC after: 1 week
Notes
Notes:
svn path=/head/; revision=162856
Diffstat (limited to 'crypto/openssh/cipher.c')
| -rw-r--r-- | crypto/openssh/cipher.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/crypto/openssh/cipher.c b/crypto/openssh/cipher.c index 1434d5524029..b264063c4031 100644 --- a/crypto/openssh/cipher.c +++ b/crypto/openssh/cipher.c @@ -1,3 +1,4 @@ +/* $OpenBSD: cipher.c,v 1.81 2006/08/03 03:34:42 deraadt Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -35,14 +36,18 @@ */ #include "includes.h" -RCSID("$OpenBSD: cipher.c,v 1.77 2005/07/16 01:35:24 djm Exp $"); + +#include <sys/types.h> + +#include <openssl/md5.h> + +#include <string.h> +#include <stdarg.h> #include "xmalloc.h" #include "log.h" #include "cipher.h" -#include <openssl/md5.h> - /* compatibility with old or broken OpenSSL versions */ #include "openbsd-compat/openssl-compat.h" |