diff -up libssh2-1.2.5/src/openssl.c.orig libssh2-1.2.5/src/openssl.c
--- libssh2-1.2.5/src/openssl.c.orig	2010-03-23 20:59:12.000000000 +0000
+++ libssh2-1.2.5/src/openssl.c	2010-04-14 09:47:51.030100005 +0100
@@ -201,7 +201,7 @@ _libssh2_cipher_crypt(_libssh2_cipher_ct
     return ret == 1 ? 0 : 1;
 }
 
-#if LIBSSH2_AES_CTR && !defined(HAVE_EVP_AES128_CTR)
+#if LIBSSH2_AES_CTR && !defined(HAVE_EVP_AES_128_CTR)
 
 #include <openssl/aes.h>
 
diff -up libssh2-1.2.5/src/openssl.h.orig libssh2-1.2.5/src/openssl.h
--- libssh2-1.2.5/src/openssl.h.orig	2010-03-23 20:59:12.000000000 +0000
+++ libssh2-1.2.5/src/openssl.h	2010-04-14 09:46:50.134101178 +0100
@@ -199,7 +199,7 @@ int _libssh2_dsa_sha1_sign(libssh2_dsa_c
 #define _libssh2_cipher_aes256 EVP_aes_256_cbc
 #define _libssh2_cipher_aes192 EVP_aes_192_cbc
 #define _libssh2_cipher_aes128 EVP_aes_128_cbc
-#ifdef HAVE_EVP_AES128_CTR
+#ifdef HAVE_EVP_AES_128_CTR
 #define _libssh2_cipher_aes128ctr EVP_aes_128_ctr
 #define _libssh2_cipher_aes192ctr EVP_aes_192_ctr
 #define _libssh2_cipher_aes256ctr EVP_aes_256_ctr
diff -up libssh2-1.2.5/configure.ac.orig libssh2-1.2.5/configure.ac
--- libssh2-1.2.5/configure.ac.orig	2010-03-23 21:42:58.000000000 +0000
+++ libssh2-1.2.5/configure.ac	2010-04-14 09:45:07.397100515 +0100
@@ -115,7 +115,7 @@ AM_CONDITIONAL(LIBGCRYPT, test "$ac_cv_l
 if test "$ac_cv_libssl" = "yes"; then
   save_LDFLAGS="$LDFLAGS"
   LDFLAGS="$LDFLAGS $LIBSSL"
-  AC_CHECK_FUNCS(EVP_aes128_ctr)
+  AC_CHECK_FUNCS(EVP_aes_128_ctr)
   LDFLAGS="$save_LDFLAGS"
 fi
 
@@ -295,7 +295,7 @@ AC_MSG_NOTICE([summary of build options:
   Compiler:         ${CC}
   Compiler flags:   ${CFLAGS}
   Library types:    Shared=${enable_shared}, Static=${enable_static}
-  Crypto library:   openssl: ${ac_cv_libssl:-no} (AES-CTR: ${ac_cv_func_EVP_aes128_ctr:-N/A}) libgcrypt: ${ac_cv_libgcrypt:-no}
+  Crypto library:   openssl: ${ac_cv_libssl:-no} (AES-CTR: ${ac_cv_func_EVP_aes_128_ctr:-N/A}) libgcrypt: ${ac_cv_libgcrypt:-no}
   Debug build:      $enable_debug
   Path to sshd:     $ac_cv_path_SSHD (only for self-tests)
   libz compression: $ac_cv_libz