From 59d51274652cca694751f6e86e5fd1d280c93143 Mon Sep 17 00:00:00 2001
From: dtucker <dtucker>
Date: Fri, 6 Feb 2004 23:41:48 +0000
Subject: [PATCH]    - dtucker@cvs.openbsd.org 2004/02/06 23:41:13     
 [cipher-ctr.c]      Use EVP_CIPHER_CTX_key_length for key length.  ok markus@
      (This will fix builds with OpenSSL 0.9.5)

---
 ChangeLog    | 7 +++++++
 cipher-ctr.c | 5 +++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4af113ae..df570e58 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+20040207
+ - (dtucker) OpenBSD CVS Sync
+   - dtucker@cvs.openbsd.org 2004/02/06 23:41:13
+     [cipher-ctr.c]
+     Use EVP_CIPHER_CTX_key_length for key length.  ok markus@
+     (This will fix builds with OpenSSL 0.9.5)
+
 20040206
  - (dtucker) [acss.c acss.h] Fix $Id tags.
  - (dtucker) [cipher-acss.c cipher.c] Enable acss only if building with
diff --git a/cipher-ctr.c b/cipher-ctr.c
index a9ddb8a6..395dabed 100644
--- a/cipher-ctr.c
+++ b/cipher-ctr.c
@@ -14,7 +14,7 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 #include "includes.h"
-RCSID("$OpenBSD: cipher-ctr.c,v 1.3 2003/11/21 11:57:03 djm Exp $");
+RCSID("$OpenBSD: cipher-ctr.c,v 1.4 2004/02/06 23:41:13 dtucker Exp $");
 
 #include <openssl/evp.h>
 
@@ -94,7 +94,8 @@ ssh_aes_ctr_init(EVP_CIPHER_CTX *ctx, const u_char *key, const u_char *iv,
 		EVP_CIPHER_CTX_set_app_data(ctx, c);
 	}
 	if (key != NULL)
-		AES_set_encrypt_key(key, ctx->key_len * 8, &c->aes_ctx);
+		AES_set_encrypt_key(key, EVP_CIPHER_CTX_key_length(ctx) * 8,
+		     &c->aes_ctx);
 	if (iv != NULL)
 		memcpy(c->aes_counter, iv, AES_BLOCK_SIZE);
 	return (1);
-- 
2.45.2