- OpenBSD CVS update

   - [auth-krb4.c]
     -Wall
   - [auth-rh-rsa.c auth-rsa.c hostfile.c hostfile.h key.c key.h match.c]
     [match.h ssh.c ssh.h sshconnect.c sshd.c]
     initial support for DSA keys. ok deraadt@, niels@
   - [cipher.c cipher.h]
     remove unused cipher_attack_detected code
   - [scp.1 ssh-add.1 ssh-agent.1 ssh-keygen.1 ssh.1 sshd.8]
     Fix some formatting problems I missed before.
   - [ssh.1 sshd.8]
     fix spelling errors, From: FreeBSD
   - [ssh.c]
     switch to raw mode only if he _get_ a pty (not if we _want_ a pty).

1 files changed, 1 insertions, 15 deletions

diff --git a/cipher.c b/cipher.c
index c55c7dcbd..bf1518ded 100644
--- a/cipher.c
+++ b/cipher.c
@@ -12,7 +12,7 @@
  */
 
 #include "includes.h"
-RCSID("$Id: cipher.c,v 1.13 2000/03/09 10:27:50 damien Exp $");
+RCSID("$Id: cipher.c,v 1.14 2000/03/26 03:04:52 damien Exp $");
 
 #include "ssh.h"
 #include "cipher.h"
@@ -110,18 +110,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.
@@ -304,7 +292,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,
@@ -312,7 +299,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,