check for existence of globus_gss_assist_map_and_authorize()

[gssapi-openssh.git] / openssh / cipher-ctr.c

diff --git a/openssh/cipher-ctr.c b/openssh/cipher-ctr.c
index a2bab5c14416780db335bab6b3074649a2b6a070..8a98f3c42559148a188ba813fe525098826f9e3d 100644 (file)
--- a/openssh/cipher-ctr.c
+++ b/openssh/cipher-ctr.c
@@ -14,14 +14,17 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 #include "includes.h"
-RCSID("$OpenBSD: cipher-ctr.c,v 1.2 2003/06/17 18:14:23 markus Exp $");
+RCSID("$OpenBSD: cipher-ctr.c,v 1.6 2005/07/17 07:17:55 djm Exp $");
 
 #include <openssl/evp.h>
 
 #include "log.h"
 #include "xmalloc.h"
 
-#if OPENSSL_VERSION_NUMBER < 0x00907000L
+/* compatibility with old or broken OpenSSL versions */
+#include "openbsd-compat/openssl-compat.h"
+
+#ifdef USE_BUILTIN_RIJNDAEL
 #include "rijndael.h"
 #define AES_KEY rijndael_ctx
 #define AES_BLOCK_SIZE 16
@@ -90,7 +93,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);
@@ -135,7 +139,9 @@ evp_aes_128_ctr(void)
        aes_ctr.init = ssh_aes_ctr_init;
        aes_ctr.cleanup = ssh_aes_ctr_cleanup;
        aes_ctr.do_cipher = ssh_aes_ctr;
+#ifndef SSH_OLD_EVP
        aes_ctr.flags = EVP_CIPH_CBC_MODE | EVP_CIPH_VARIABLE_LENGTH |
            EVP_CIPH_ALWAYS_CALL_INIT | EVP_CIPH_CUSTOM_IV;
+#endif
        return (&aes_ctr);
 }