diff options
| author | kris <kris@FreeBSD.org> | 2000-03-26 07:37:48 +0000 |
|---|---|---|
| committer | kris <kris@FreeBSD.org> | 2000-03-26 07:37:48 +0000 |
| commit | 6948a837767a9680a772b450c7b732a4ae2cb6b3 (patch) | |
| tree | b3a49bfc6fa4a3d8454dabb3d5e8eb13430c567f /crypto/openssh/cipher.h | |
| parent | e46dd7a5de99ccc52b80f94f507cb226ce21c6d0 (diff) | |
| download | FreeBSD-src-6948a837767a9680a772b450c7b732a4ae2cb6b3.zip FreeBSD-src-6948a837767a9680a772b450c7b732a4ae2cb6b3.tar.gz | |
Resolve conflicts.
Diffstat (limited to 'crypto/openssh/cipher.h')
| -rw-r--r-- | crypto/openssh/cipher.h | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/crypto/openssh/cipher.h b/crypto/openssh/cipher.h index bb87f88..492dda3 100644 --- a/crypto/openssh/cipher.h +++ b/crypto/openssh/cipher.h @@ -12,7 +12,7 @@ * $FreeBSD$ */ -/* RCSID("$Id: cipher.h,v 1.10 1999/11/24 19:53:46 markus Exp $"); */ +/* RCSID("$Id: cipher.h,v 1.11 2000/03/22 09:55:10 markus Exp $"); */ #ifndef CIPHER_H #define CIPHER_H @@ -89,10 +89,4 @@ void cipher_decrypt(CipherContext * context, unsigned char *dest, const unsigned char *src, unsigned int len); -/* - * If and CRC-32 attack is detected this function is called. Defaults to - * fatal, changed to packet_disconnect in sshd and ssh. - */ -extern void (*cipher_attack_detected) (const char *fmt, ...); - #endif /* CIPHER_H */ |
