diff options
| author | Simon L. B. Nielsen <simon@FreeBSD.org> | 2007-03-15 20:26:26 +0000 |
|---|---|---|
| committer | Simon L. B. Nielsen <simon@FreeBSD.org> | 2007-03-15 20:26:26 +0000 |
| commit | c30e4c61747efa38a51b4f5848b597da341fd0cd (patch) | |
| tree | 3c346c3924a708cc2fcd638e728c7022f275fda7 | |
| parent | 5471f83ea72e251ea1f0d04428878a74347efa0f (diff) | |
| download | src-c30e4c61747efa38a51b4f5848b597da341fd0cd.tar.gz src-c30e4c61747efa38a51b4f5848b597da341fd0cd.zip | |
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
Notes
Notes:
svn path=/vendor-crypto/openssl/dist/; revision=167617
| -rw-r--r-- | crypto/openssl/crypto/evp/evp_lib.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/openssl/crypto/evp/evp_lib.c b/crypto/openssl/crypto/evp/evp_lib.c index f92db23af649..edb28ef38ed7 100644 --- a/crypto/openssl/crypto/evp/evp_lib.c +++ b/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) |