diff options
| author | kris <kris@FreeBSD.org> | 2000-03-26 07:07:24 +0000 |
|---|---|---|
| committer | kris <kris@FreeBSD.org> | 2000-03-26 07:07:24 +0000 |
| commit | b201b15ee1575ab28ed4f9b5a7d430e835a7c7ae (patch) | |
| tree | 561c850bc04e7b62c9fc641be89ac412589219c1 /crypto/openssh/cipher.c | |
| parent | fc557ff7d97438559e69347575f5aa8ef03a5f50 (diff) | |
| download | FreeBSD-src-b201b15ee1575ab28ed4f9b5a7d430e835a7c7ae.zip FreeBSD-src-b201b15ee1575ab28ed4f9b5a7d430e835a7c7ae.tar.gz | |
Virgin import of OpenSSH sources dated 2000/03/25
Diffstat (limited to 'crypto/openssh/cipher.c')
| -rw-r--r-- | crypto/openssh/cipher.c | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/crypto/openssh/cipher.c b/crypto/openssh/cipher.c index 552bbe3..682a980 100644 --- a/crypto/openssh/cipher.c +++ b/crypto/openssh/cipher.c @@ -12,7 +12,7 @@ */ #include "includes.h" -RCSID("$Id: cipher.c,v 1.19 2000/02/22 15:19:29 markus Exp $"); +RCSID("$Id: cipher.c,v 1.20 2000/03/22 09:55:10 markus Exp $"); #include "ssh.h" #include "cipher.h" @@ -104,18 +104,6 @@ swap_bytes(const unsigned char *src, unsigned char *dst_, int n) } } -void (*cipher_attack_detected) (const char *fmt,...) = fatal; - -static inline void -detect_cbc_attack(const unsigned char *src, - unsigned int len) -{ - return; - - log("CRC-32 CBC insertion attack detected"); - cipher_attack_detected("CRC-32 CBC insertion attack detected"); -} - /* * Names of all encryption algorithms. * These must match the numbers defined in cipher.h. @@ -298,7 +286,6 @@ cipher_decrypt(CipherContext *context, unsigned char *dest, break; case SSH_CIPHER_3DES: - /* CRC-32 attack? */ SSH_3CBC_DECRYPT(context->u.des3.key1, context->u.des3.key2, &context->u.des3.iv2, context->u.des3.key3, &context->u.des3.iv3, @@ -306,7 +293,6 @@ cipher_decrypt(CipherContext *context, unsigned char *dest, break; case SSH_CIPHER_BLOWFISH: - detect_cbc_attack(src, len); swap_bytes(src, dest, len); BF_cbc_encrypt((void *) dest, dest, len, &context->u.bf.key, context->u.bf.iv, |
