diff options
| author | green <green@FreeBSD.org> | 2001-05-04 04:14:23 +0000 |
|---|---|---|
| committer | green <green@FreeBSD.org> | 2001-05-04 04:14:23 +0000 |
| commit | 119a11eb6ba03d0462b261cbf754fd7f9403856f (patch) | |
| tree | b1b150fe8db4b17e6f78564346bf7ba5b1fbddfb /crypto/openssh/cipher.h | |
| parent | 08fd06354d1aae8cd1350eb68d9f549e0c4d9037 (diff) | |
| download | FreeBSD-src-119a11eb6ba03d0462b261cbf754fd7f9403856f.zip FreeBSD-src-119a11eb6ba03d0462b261cbf754fd7f9403856f.tar.gz | |
Fix conflicts for OpenSSH 2.9.
Diffstat (limited to 'crypto/openssh/cipher.h')
| -rw-r--r-- | crypto/openssh/cipher.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crypto/openssh/cipher.h b/crypto/openssh/cipher.h index 006fef9..870d1da 100644 --- a/crypto/openssh/cipher.h +++ b/crypto/openssh/cipher.h @@ -32,8 +32,8 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -/* RCSID("$OpenBSD: cipher.h,v 1.22 2000/10/13 18:59:14 markus Exp $"); */ -/* $FreeBSD$ */ +/* RCSID("$OpenBSD: cipher.h,v 1.25 2000/12/19 23:17:56 markus Exp $"); */ +/* RCSID("$FreeBSD$"); */ #ifndef CIPHER_H #define CIPHER_H @@ -104,7 +104,7 @@ struct Cipher { void (*decrypt)(CipherContext *, u_char *, const u_char *, u_int); }; -unsigned int cipher_mask_ssh1(int client); +u_int cipher_mask_ssh1(int client); Cipher *cipher_by_name(const char *name); Cipher *cipher_by_number(int id); int cipher_number(const char *name); |
