Import fix from upstream OpenSSL_0_9_8-stable branch:

EVP_CIPHER_CTX_key_length() should return the set key length
	in the EVP_CIPHER_CTX structure which may not be the same as
	the underlying cipher key length for variable length ciphers.

This fixes problems in OpenSSH using some ciphers, and possibly other
applications.

See also:	http://bugzilla.mindrot.org/show_bug.cgi?id=1291

crypto/openssl/crypto/evp/evp_lib.c

@@ -225,7 +225,7 @@ int EVP_CIPHER_key_length(const EVP_CIPHER *cipher)
 
 int EVP_CIPHER_CTX_key_length(const EVP_CIPHER_CTX *ctx)
 	{
-	return ctx->cipher->key_len;
+	return ctx->key_len;
 	}
 
 int EVP_CIPHER_nid(const EVP_CIPHER *cipher)