===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/Attic/cipher-ctr.c,v
retrieving revision 1.4
retrieving revision 1.4.4.2
diff -u -r1.4 -r1.4.4.2
--- src/usr.bin/ssh/Attic/cipher-ctr.c	2004/02/06 23:41:13	1.4
+++ src/usr.bin/ssh/Attic/cipher-ctr.c	2005/09/02 03:45:00	1.4.4.2
@@ -14,23 +14,14 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 #include "includes.h"
-RCSID("$OpenBSD: cipher-ctr.c,v 1.4 2004/02/06 23:41:13 dtucker Exp $");
+RCSID("$OpenBSD: cipher-ctr.c,v 1.4.4.2 2005/09/02 03:45:00 brad Exp $");
 
 #include <openssl/evp.h>
+#include <openssl/aes.h>
 
 #include "log.h"
 #include "xmalloc.h"
 
-#if OPENSSL_VERSION_NUMBER < 0x00907000L
-#include "rijndael.h"
-#define AES_KEY rijndael_ctx
-#define AES_BLOCK_SIZE 16
-#define AES_encrypt(a, b, c) rijndael_encrypt(c, a, b)
-#define AES_set_encrypt_key(a, b, c) rijndael_set_key(c, (char *)a, b, 1)
-#else
-#include <openssl/aes.h>
-#endif
-
 const EVP_CIPHER *evp_aes_128_ctr(void);
 void ssh_aes_ctr_iv(EVP_CIPHER_CTX *, int, u_char *, u_int);
 
@@ -91,7 +82,7 @@
 	}
 	if (key != NULL)
 		AES_set_encrypt_key(key, EVP_CIPHER_CTX_key_length(ctx) * 8,
-		     &c->aes_ctx);
+		    &c->aes_ctx);
 	if (iv != NULL)
 		memcpy(c->aes_counter, iv, AES_BLOCK_SIZE);
 	return (1);