[Pkg-openssl-changes] r213 - in openssl/trunk: crypto/evp debian

[Kurt Roeckx]

Author: kroeckx
Date: 2007-03-04 23:24:23 +0000 (Sun, 04 Mar 2007)
New Revision: 213

Modified:
   openssl/trunk/crypto/evp/evp_lib.c
   openssl/trunk/debian/changelog
Log:
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.
>From upstream CVS.  (Closes: #412979)


Modified: openssl/trunk/crypto/evp/evp_lib.c
===================================================================
--- openssl/trunk/crypto/evp/evp_lib.c	2007-03-04 23:20:30 UTC (rev 212)
+++ openssl/trunk/crypto/evp/evp_lib.c	2007-03-04 23:24:23 UTC (rev 213)
@@ -225,7 +225,7 @@
 
 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)

Modified: openssl/trunk/debian/changelog
===================================================================
--- openssl/trunk/debian/changelog	2007-03-04 23:20:30 UTC (rev 212)
+++ openssl/trunk/debian/changelog	2007-03-04 23:24:23 UTC (rev 213)
@@ -2,8 +2,12 @@
 
   * Add nagios-nrpe-server to the list of services to be checked
     (Closes: #391188)
+  * 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.
+    From upstream CVS.  (Closes: #412979)
 
- -- Kurt Roeckx <kurt at roeckx.be>  Tue, 27 Feb 2007 17:28:50 +0000
+ -- Kurt Roeckx <kurt at roeckx.be>  Sun,  4 Mar 2007 23:22:51 +0000
 
 openssl (0.9.8e-2) unstable; urgency=low